| e77fa2db67d318c3b45fc769f5c43030b4b09da7 |
11-Feb-2018 |
android-build-team Robot <android-build-team-robot@google.com> |
Snap for 4598635 from d66a90290b2cc7a9a538c54328df8b2292a91033 to pi-release
Change-Id: Ifcc0c6adaa73b095655b542f07c3e3398dc3eabc
|
| d66a90290b2cc7a9a538c54328df8b2292a91033 |
10-Feb-2018 |
Chris Craik <ccraik@google.com> |
[automerger] Add bounds checking for transparency lookup am: 53f97a2dd6 am: f171582d41 am: 7c096751ec am: 964b4bc316 am: 1e74900d02 am: cdb13addd3 am: a9b1c97298 am: 5cef228075 am: 98a14c56a8 am: a5ed4c7ef4 am: 7226042d2a am: 6b2d056043 am: 24f183e9b7
am: f4c429cda5
Change-Id: I980a3ccd194ad39ebba6fc174d215cb6140a84b8
|
| f4c429cda504e73e5dbd37b69fd72fbaf9f96298 |
10-Feb-2018 |
Chris Craik <ccraik@google.com> |
[automerger] Add bounds checking for transparency lookup am: 53f97a2dd6 am: f171582d41 am: 7c096751ec am: 964b4bc316 am: 1e74900d02 am: cdb13addd3 am: a9b1c97298 am: 5cef228075 am: 98a14c56a8 am: a5ed4c7ef4 am: 7226042d2a am: 6b2d056043
am: 24f183e9b7
Change-Id: Ic3044a0b0fe3d067cf53247f134fea0898d5ffa7
|
| 24f183e9b72d64abb95576773e7028ccbd3736c6 |
10-Feb-2018 |
Chris Craik <ccraik@google.com> |
[automerger] Add bounds checking for transparency lookup am: 53f97a2dd6 am: f171582d41 am: 7c096751ec am: 964b4bc316 am: 1e74900d02 am: cdb13addd3 am: a9b1c97298 am: 5cef228075 am: 98a14c56a8 am: a5ed4c7ef4 am: 7226042d2a
am: 6b2d056043
Change-Id: I49bb68bf9867292cb3380346e361209514a40d9b
|
| 6b2d05604391857a7386f9c7b0837165338b0996 |
10-Feb-2018 |
Chris Craik <ccraik@google.com> |
[automerger] Add bounds checking for transparency lookup am: 53f97a2dd6 am: f171582d41 am: 7c096751ec am: 964b4bc316 am: 1e74900d02 am: cdb13addd3 am: a9b1c97298 am: 5cef228075 am: 98a14c56a8 am: a5ed4c7ef4
am: 7226042d2a
Change-Id: Iab3ed8e68d66ad2ed8b3c01b318c6769ed6ef006
|
| 7226042d2ae3ffc7820b757a1ffcea00add92150 |
10-Feb-2018 |
Android Build Merger (Role) <noreply-android-build-merger@google.com> |
[automerger] Add bounds checking for transparency lookup am: 53f97a2dd6 am: f171582d41 am: 7c096751ec am: 964b4bc316 am: 1e74900d02 am: cdb13addd3 am: a9b1c97298 am: 5cef228075 am: 98a14c56a8 am: a5ed4c7ef4
Change-Id: I4977f5e4870a2275b1f95c22a6e2be16005e8418
|
| a5ed4c7ef4765436128bbeb6cb09a2c096f67141 |
10-Feb-2018 |
Android Build Merger (Role) <noreply-android-build-merger@google.com> |
[automerger] Add bounds checking for transparency lookup am: 53f97a2dd6 am: f171582d41 am: 7c096751ec am: 964b4bc316 am: 1e74900d02 am: cdb13addd3 am: a9b1c97298 am: 5cef228075 am: 98a14c56a8
Change-Id: Iaa184524850b1d3dcc0668b09edda47dbb168ded
|
| 98a14c56a836f110db07c010580ea87e0579bab4 |
10-Feb-2018 |
Android Build Merger (Role) <noreply-android-build-merger@google.com> |
[automerger] Add bounds checking for transparency lookup am: 53f97a2dd6 am: f171582d41 am: 7c096751ec am: 964b4bc316 am: 1e74900d02 am: cdb13addd3 am: a9b1c97298 am: 5cef228075
Change-Id: I653aa1aa3555568c0cf6eac4316204de3ce6a0a3
|
| 5cef2280754bf4b194d5718e0aab75993fb774bd |
10-Feb-2018 |
Android Build Merger (Role) <noreply-android-build-merger@google.com> |
[automerger] Add bounds checking for transparency lookup am: 53f97a2dd6 am: f171582d41 am: 7c096751ec am: 964b4bc316 am: 1e74900d02 am: cdb13addd3 am: a9b1c97298
Change-Id: I1c206f85e5277eb2a473273b0199a21056549fe8
|
| a9b1c972983b7a40fe39dca89e9d9ee39a70bc7c |
10-Feb-2018 |
Android Build Merger (Role) <noreply-android-build-merger@google.com> |
[automerger] Add bounds checking for transparency lookup am: 53f97a2dd6 am: f171582d41 am: 7c096751ec am: 964b4bc316 am: 1e74900d02 am: cdb13addd3
Change-Id: I072f9ddc6b3a970c9e23f1b646a9b9b588f065ec
|
| cdb13addd31cc3328b9477e0424d11271b4dcf5c |
10-Feb-2018 |
Android Build Merger (Role) <noreply-android-build-merger@google.com> |
[automerger] Add bounds checking for transparency lookup am: 53f97a2dd6 am: f171582d41 am: 7c096751ec am: 964b4bc316 am: 1e74900d02
Change-Id: I2f8ad51f9fac12230280a80f770b8d5e213714d6
|
| 1e74900d02f2795bb51d6019557b4475b73c2232 |
10-Feb-2018 |
Android Build Merger (Role) <noreply-android-build-merger@google.com> |
[automerger] Add bounds checking for transparency lookup am: 53f97a2dd6 am: f171582d41 am: 7c096751ec am: 964b4bc316
Change-Id: If2d513584e356a378687eacba4b9ab28f76aeaed
|
| 964b4bc316cab175f9b42eef46dfc653decd49d6 |
10-Feb-2018 |
Android Build Merger (Role) <noreply-android-build-merger@google.com> |
[automerger] Add bounds checking for transparency lookup am: 53f97a2dd6 am: f171582d41 am: 7c096751ec
Change-Id: Ic2f2070a50d960870426302b3dbc4acb2d24ccc3
|
| 7c096751ecbf57eba6c9d11129aa1d119dc4561b |
10-Feb-2018 |
Android Build Merger (Role) <noreply-android-build-merger@google.com> |
[automerger] Add bounds checking for transparency lookup am: 53f97a2dd6 am: f171582d41
Change-Id: I0393bc102e070d54c2b4d78084be4a65e8effc8b
|
| f171582d4184642bb87cd08809271125a3e20871 |
10-Feb-2018 |
Android Build Merger (Role) <noreply-android-build-merger@google.com> |
[automerger] Add bounds checking for transparency lookup am: 53f97a2dd6
Change-Id: Ibc19c1861176558ec69c2a67f4ff17b9a1e275bb
|
| 53f97a2dd69b5b74e0fae2108ebab9276760aa47 |
09-Feb-2018 |
Chris Craik <ccraik@google.com> |
Add bounds checking for transparency lookup
Bug: 71361451
Test: manual test with sample app
Change-Id: Icaa626cfc93115fe1cc2f42040b396c2318bb6e4
ramesequence/jni/FrameSequence_gif.cpp
|
| 7453f1141afd7b69b429843f5429295635c7897b |
09-Feb-2018 |
Chris Craik <ccraik@google.com> |
Use all-makefiles-under to fix FrameSequenceSample compilation
Now builds with:
tapas FrameSequenceSample
m && adb install -r $ANDROID_PRODUCT_OUT/system/app/FrameSequenceSample/FrameSequenceSample.apk
Test: sample app builds & runs
Change-Id: I3871bdb28992ed6373def1093339339e291537a9
ramesequence/Android.mk
|
| 1d2026e7de6616529070470b0d0c6cddd3412e08 |
29-Jan-2018 |
gitbuildkicker <android-build@google.com> |
merge in pi-release history after reset to master
|
| e7f06ba9e53469a82b1a923394a5d69b61751702 |
29-Jan-2018 |
gitbuildkicker <android-build@google.com> |
merge in pi-release history after reset to master
|
| 7870c8ed1473177a89c994abd94b25b57e22493d |
28-Jan-2018 |
android-build-team Robot <android-build-team-robot@google.com> |
Snap for 4571561 from 043543c471f8c24190a8a4ceb804e2c8efa1723e to pi-release
Change-Id: I2399ce9a7570c911eb3172c417c6856480d87baa
|
| 043543c471f8c24190a8a4ceb804e2c8efa1723e |
26-Jan-2018 |
Dan Willemsen <dwillemsen@google.com> |
Merge "Convert android-common to Android.bp" am: 2fd9d9cb04 am: ea57466424
am: dff38f4980
Change-Id: Ifd79f101f146cb0db6498247312d31b22f95cc49
|
| dff38f49802597085d25c0c0595be637b76a38c1 |
26-Jan-2018 |
Dan Willemsen <dwillemsen@google.com> |
Merge "Convert android-common to Android.bp" am: 2fd9d9cb04
am: ea57466424
Change-Id: Ib6188c8025e043fbcc64caf8c43d2632567119a0
|
| ea5746642456f694fa8a283f803faa7dcdf9ad2c |
26-Jan-2018 |
Dan Willemsen <dwillemsen@google.com> |
Merge "Convert android-common to Android.bp"
am: 2fd9d9cb04
Change-Id: Ic1a34aaecdd2ee92719e06759081802db29e0e4e
|
| 2fd9d9cb046b212889797eeb8aa92e25ace172e0 |
26-Jan-2018 |
Dan Willemsen <dwillemsen@google.com> |
Merge "Convert android-common to Android.bp"
|
| de37229b3cbc0c975ac4ea38b5e58e960c080c0a |
24-Jan-2018 |
Jiyong Park <jiyong@google.com> |
Use stubs libs for android.test.base/runner/mock
android.test.base/runner/mock libraries are shared libraries that are
built without SDK, but with framework interanl libraries (framework.jar,
etc). Apps or libs that are built with SDK (LOCAL_SDK_VERSION is set)
shouldn't use them, but instead the stubs version of the test framework
libraries, which are built using SDK.
This is because, the build system does not allow a module built with SDK
to depend on another module built without SDK. This has been
exceptionally allowed with warnings, but will soon be errors.
In order to prevent the expected build breakage, direct reference to the
shared libraries are all changed to the stubs libraries.
Note: no one has been using these shared libs statically. So, it is
guaranteed that they won't encounter a problem due to missing
<uses-library name="android.test.runner"/> even after this change.
Bug: 69899800
Test: m -j checkbuild
Change-Id: I20b780d8e7654ec29858d83184785b46e21007b6
ommon/tests/Android.mk
|
| 1fb499e29d9260b8123334cd22c7795b49617197 |
08-Dec-2017 |
Colin Cross <ccross@android.com> |
Convert android-common to Android.bp
See build/soong/README.md for more information.
Test: m checkbuild
Change-Id: I7d8dd94e45f468b06b44af39975b1769dcb14bcc
ommon/Android.bp
ommon/Android.mk
|
| 1c0b893514f7bc1252591fbcd13900e33816a5a6 |
11-Dec-2017 |
android-build-team Robot <android-build-team-robot@google.com> |
Snap for 4496165 from 56ad091e7f92cfb1df122cc1b432d9c3b3571de1 to pi-release
Change-Id: I16a8fdd909f6f0c2b7e290070f9758edd2e57abe
|
| 56ad091e7f92cfb1df122cc1b432d9c3b3571de1 |
08-Dec-2017 |
Xin Li <delphij@google.com> |
Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: d895e88843 -s ours am: 5e461196ee
am: b62c107908 -s ours
Change-Id: I5b234cf93fd9260d07cfd3cfdbc8958bde4a13e4
|
| 41900e789d64f5769dd8dcf5d3db2035894cc01e |
07-Dec-2017 |
Xin Li <delphij@google.com> |
DO NOT MERGE: Merge Oreo MR1 into master am: d7f9a3ce3d -s ours am: 551094754b
am: 5569bb868d -s ours
Change-Id: I90c2affc1353ccec11c9cd6e8ecc0af24bd70d60
|
| b62c1079089e7a0aa045cc3b53b85ec7841f4740 |
07-Dec-2017 |
Xin Li <delphij@google.com> |
Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: d895e88843 -s ours
am: 5e461196ee
Change-Id: I9f62de31f83a7001f613404176d405c54aae17e0
|
| 5e461196eefd9f5ab6a92c843d3c018ced3938d4 |
07-Dec-2017 |
Xin Li <delphij@google.com> |
Merge "DO NOT MERGE: Merge Oreo MR1 into master"
am: d895e88843 -s ours
Change-Id: Ib35c4402391462c4e3b9cf3411367edddd419c0a
|
| 5569bb868dea81e449e5be3681e6f8454d67a6a6 |
07-Dec-2017 |
Xin Li <delphij@google.com> |
DO NOT MERGE: Merge Oreo MR1 into master am: d7f9a3ce3d -s ours
am: 551094754b
Change-Id: If54b07ed9c07f500d6059e93804b033ae64b31b7
|
| 551094754b79e5d7935b5c1c17fe1a91e206911d |
07-Dec-2017 |
Xin Li <delphij@google.com> |
DO NOT MERGE: Merge Oreo MR1 into master
am: d7f9a3ce3d -s ours
Change-Id: I1e08610eb3bdd1fe932b8729e9b37d14a1b5d933
|
| d895e8884381c3eb16b15c778eec3c55a4aba99b |
07-Dec-2017 |
Xin Li <delphij@google.com> |
Merge "DO NOT MERGE: Merge Oreo MR1 into master"
|
| d7f9a3ce3daf0dbe84e95c06d8f2ae03e56d4fe3 |
06-Dec-2017 |
Xin Li <delphij@google.com> |
DO NOT MERGE: Merge Oreo MR1 into master
Exempt-From-Owner-Approval: Changes already landed internally
Change-Id: Ibfe707a5404762344b0bcb76827a653a1989ffd7
|
| 339c154dbaa189cc951dd8098e1d2d112b91fd05 |
15-Nov-2017 |
android-build-team Robot <android-build-team-robot@google.com> |
Snap for 4453288 from 2003d2fb750e0de8e078ee2c9e362bdbbbcfad8d to pi-release
Change-Id: Ic5495d43f729b1c43d354b48dd9ab0dedf894608
|
| 2003d2fb750e0de8e078ee2c9e362bdbbbcfad8d |
15-Nov-2017 |
Xin Li <delphij@google.com> |
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
am: 8f27b10393
Change-Id: Iecf478525f6fb1e96ec6207bdf73927ef6ed1fdb
|
| 8f27b10393bd7840685994cbaeca1544d7c5b9db |
15-Nov-2017 |
Xin Li <delphij@google.com> |
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
Change-Id: I288dff582fac01d8d54a9327b0ab570ce0dc7975
|
| 9d14f09974bf4c7b3a824d0d727b6601cc3645cd |
13-Nov-2017 |
Xin Li <delphij@google.com> |
Merge commit 'ee4e5f8511e7d383304cdd6024b640a21fb1f39f' into HEAD
Change-Id: I3e157c5c725fc27b041147272d2242777d40f707
|
| cde21106f432057dc10991a4a7c68859cebd029f |
12-Nov-2017 |
android-build-team Robot <android-build-team-robot@google.com> |
Snap for 4447680 from 73437391b6e3efcf1f5302ffedcd745f13b6528b to pi-release
Change-Id: I709cbd4ca144209cf0a78b764621f8b09ed425c6
|
| 73437391b6e3efcf1f5302ffedcd745f13b6528b |
09-Nov-2017 |
Chih-Hung Hsieh <chh@google.com> |
Merge "Use -Werror in frameworks/ex" am: 5e99bdb567 am: 852a4a711c
am: 03b41f8507
Change-Id: I9476b9eedbd80d6249d84549a644f2f9a0ddfeeb
|
| 03b41f8507b21cce3715b460868b96c0a6298e58 |
09-Nov-2017 |
Chih-Hung Hsieh <chh@google.com> |
Merge "Use -Werror in frameworks/ex" am: 5e99bdb567
am: 852a4a711c
Change-Id: I218f4aa725a0fdba37c8d89b6443b80c3799b87d
|
| 852a4a711c941e443d45fa51057dd856c9d4af35 |
09-Nov-2017 |
Chih-Hung Hsieh <chh@google.com> |
Merge "Use -Werror in frameworks/ex"
am: 5e99bdb567
Change-Id: I21dd3557361abeb08e078ff7e041e445247c5a66
|
| 5e99bdb56774017372beab72b218363449f966ea |
09-Nov-2017 |
Treehugger Robot <treehugger-gerrit@google.com> |
Merge "Use -Werror in frameworks/ex"
|
| b3f9864a7b86ae55fb23121a07a7ef838e7fdd88 |
09-Nov-2017 |
Chih-Hung Hsieh <chh@google.com> |
Use -Werror in frameworks/ex
Bug: 66996870
Test: build with WITH_TIDY=1
Change-Id: I88c2cb9bb7683952ed3ef59c326ed55459481882
ramesequence/jni/Android.mk
|
| b169f4098df8e7ec704272a7cfc7e3eea73550c9 |
08-Nov-2017 |
android-build-team Robot <android-build-team-robot@google.com> |
Snap for 4439972 from 220d1194887722c33cadcdd29ba81fc8929c95f8 to pi-release
Change-Id: I5b5149c76619c3c7dc79788903b1e162c9bbac6e
|
| 220d1194887722c33cadcdd29ba81fc8929c95f8 |
08-Nov-2017 |
Chris Craik <ccraik@google.com> |
Skip composition of frames lacking a color map am: 0dc887f70e am: d615be0039 am: 5c24be498e am: 5943b3b00d am: 23f4980f7e am: c3621ebb09 am: 73bf156019 am: 65fa609014 am: 6e67fc565b am: cb659dbb96 am: 90cbf18e70 am: c5be0c584f am: 97183a1c99
am: 7235e1721d
Change-Id: I8d2c15c454a3751e7354be75782fb9e5109bb612
|
| 7235e1721d77ed4453972060ba7cf03336facde3 |
08-Nov-2017 |
Chris Craik <ccraik@google.com> |
Skip composition of frames lacking a color map am: 0dc887f70e am: d615be0039 am: 5c24be498e am: 5943b3b00d am: 23f4980f7e am: c3621ebb09 am: 73bf156019 am: 65fa609014 am: 6e67fc565b am: cb659dbb96 am: 90cbf18e70 am: c5be0c584f
am: 97183a1c99
Change-Id: Ic449e137f6c2acf44d87161ef5d146834949c443
|
| 97183a1c994dee7b32f7ec429f8516f50e214095 |
08-Nov-2017 |
Chris Craik <ccraik@google.com> |
Skip composition of frames lacking a color map am: 0dc887f70e am: d615be0039 am: 5c24be498e am: 5943b3b00d am: 23f4980f7e am: c3621ebb09 am: 73bf156019 am: 65fa609014 am: 6e67fc565b am: cb659dbb96 am: 90cbf18e70
am: c5be0c584f
Change-Id: I7a9da56b23062150f31c0231e90bf3dc4607af8e
|
| c5be0c584f3afa9ea59be619d5bf4f60f6191d74 |
08-Nov-2017 |
Chris Craik <ccraik@google.com> |
Skip composition of frames lacking a color map am: 0dc887f70e am: d615be0039 am: 5c24be498e am: 5943b3b00d am: 23f4980f7e am: c3621ebb09 am: 73bf156019 am: 65fa609014 am: 6e67fc565b am: cb659dbb96
am: 90cbf18e70
Change-Id: I9b163e0b65eec70eeb1e54fe07f1a936a730c40c
|
| 90cbf18e70bdb344ec2a909e3f3bedbd7d84f605 |
08-Nov-2017 |
Chris Craik <ccraik@google.com> |
Skip composition of frames lacking a color map am: 0dc887f70e am: d615be0039 am: 5c24be498e am: 5943b3b00d am: 23f4980f7e am: c3621ebb09 am: 73bf156019 am: 65fa609014 am: 6e67fc565b
am: cb659dbb96
Change-Id: If7a66539845f4656aa26644b5fe9bbfbe8d70093
|
| cb659dbb96d5544c2f285d7586595f64d82771eb |
08-Nov-2017 |
Chris Craik <ccraik@google.com> |
Skip composition of frames lacking a color map am: 0dc887f70e am: d615be0039 am: 5c24be498e am: 5943b3b00d am: 23f4980f7e am: c3621ebb09 am: 73bf156019 am: 65fa609014
am: 6e67fc565b
Change-Id: Ice4612156c0daf3995e1d8a18c575ad4646b7250
|
| 6e67fc565b69602289e939e0efcb11a9463508d0 |
08-Nov-2017 |
Chris Craik <ccraik@google.com> |
Skip composition of frames lacking a color map am: 0dc887f70e am: d615be0039 am: 5c24be498e am: 5943b3b00d am: 23f4980f7e am: c3621ebb09 am: 73bf156019
am: 65fa609014
Change-Id: I9ef1cc7a26021acd7a8ae44f967d48dabdddc297
|
| 65fa609014f6ade8c80d16d4a02dbe23cdfa97aa |
08-Nov-2017 |
Chris Craik <ccraik@google.com> |
Skip composition of frames lacking a color map am: 0dc887f70e am: d615be0039 am: 5c24be498e am: 5943b3b00d am: 23f4980f7e am: c3621ebb09
am: 73bf156019
Change-Id: Ia756a27159dd757f6700af6c58a82f2d77dfc7e2
|
| 73bf156019d316a8f60fb1c22f45a2cf77efc6f9 |
08-Nov-2017 |
Chris Craik <ccraik@google.com> |
Skip composition of frames lacking a color map am: 0dc887f70e am: d615be0039 am: 5c24be498e am: 5943b3b00d am: 23f4980f7e
am: c3621ebb09
Change-Id: I97744deed4a4eed699c52b35021af0a632ee9f44
|
| c3621ebb0985ed3d6298d9aefd2ddf323f4f5bb0 |
08-Nov-2017 |
Chris Craik <ccraik@google.com> |
Skip composition of frames lacking a color map am: 0dc887f70e am: d615be0039 am: 5c24be498e am: 5943b3b00d
am: 23f4980f7e
Change-Id: I9c99b880dd31b88f24d56bcd605e7221b09fc417
|
| 23f4980f7e424582fc2985e129c348715f15e789 |
08-Nov-2017 |
Chris Craik <ccraik@google.com> |
Skip composition of frames lacking a color map am: 0dc887f70e am: d615be0039 am: 5c24be498e
am: 5943b3b00d
Change-Id: I1b88350a1077e1cc35d8d778ec7afdc5f9a489c3
|
| 5943b3b00d722eaf960e43e3a0620b925c983565 |
08-Nov-2017 |
Chris Craik <ccraik@google.com> |
Skip composition of frames lacking a color map am: 0dc887f70e am: d615be0039
am: 5c24be498e
Change-Id: Ic7863cad4df294dc48150aff164aaaa96acf541e
|
| 5c24be498e2f182df387774742a389b5d67fe765 |
08-Nov-2017 |
Chris Craik <ccraik@google.com> |
Skip composition of frames lacking a color map am: 0dc887f70e
am: d615be0039
Change-Id: I8bc0bd617f6235fd2efe191d91f2f51eb8a9bbab
|
| d615be00396d4aa9acc36069b51c3804219de053 |
08-Nov-2017 |
Chris Craik <ccraik@google.com> |
Skip composition of frames lacking a color map
am: 0dc887f70e
Change-Id: I6e37b713e3f3b058ec514301649413432568b0a4
|
| 0dc887f70eeea8d707cb426b96c6756edd1c607d |
02-Nov-2017 |
Chris Craik <ccraik@google.com> |
Skip composition of frames lacking a color map
Bug:68399117
Change-Id: I32f1d6856221b8a60130633edb69da2d2986c27c
ramesequence/jni/FrameSequence_gif.cpp
|
| ee4e5f8511e7d383304cdd6024b640a21fb1f39f |
16-Jun-2017 |
Michal Karpinski <mkarpinski@google.com> |
Fix a bug in OperationScheduler#getNextTimeMillis()
moratoriumTimeMillis which is a wall clock time was wrongly
used as a limit for backoff, which was then added to another wall
clock time. This has resulted in getNextTimeMillis() returning the
time tens of years in the future.
Bug: 62161211
Test: runtest -c com.android.common.OperationSchedulerTest android-common-ex
Change-Id: Ie0ef7c9bda1194568e8c8bea820c3b6a601d209c
ommon/java/com/android/common/OperationScheduler.java
ommon/tests/src/com/android/common/OperationSchedulerTest.java
|
| 6c6485854a7e010a219dd9f9bc87902b36851f6b |
13-Jun-2017 |
Chih-hung Hsieh <chh@google.com> |
Merge "Add OWNERS in frameworks/ex" am: d2ea93572b am: 23cf8125d4 am: 77dfa2a9b4
am: 9ac18aa601
Change-Id: I4395d68f8dbfdd2f7e76924b810470c770875bf3
|
| 9ac18aa601e927ecfa3948836b388844082971b5 |
13-Jun-2017 |
Chih-hung Hsieh <chh@google.com> |
Merge "Add OWNERS in frameworks/ex" am: d2ea93572b am: 23cf8125d4
am: 77dfa2a9b4
Change-Id: Ied4e4aee207e99cbdeeaba401f51cbce5217b99a
|
| 77dfa2a9b4c5acafa45d7f09bd95dc44da54fc4d |
13-Jun-2017 |
Chih-hung Hsieh <chh@google.com> |
Merge "Add OWNERS in frameworks/ex" am: d2ea93572b
am: 23cf8125d4
Change-Id: Ie26115e3bdf74ad27f87883720a99c49a853adfb
|
| 23cf8125d436f2cd2d0edaff5e5553d66f7076e9 |
13-Jun-2017 |
Chih-hung Hsieh <chh@google.com> |
Merge "Add OWNERS in frameworks/ex"
am: d2ea93572b
Change-Id: I7501b3ae752bc2edf91b8a82dafeaaa50cd37a3e
|
| d2ea93572bd276e4b5b9bd86887603a35f9a0f5b |
13-Jun-2017 |
Chih-hung Hsieh <chh@google.com> |
Merge "Add OWNERS in frameworks/ex"
|
| d50c1b6f697b642f317f6f95ca82ecb126fa506a |
12-Jun-2017 |
Chih-Hung Hsieh <chh@google.com> |
Add OWNERS in frameworks/ex
* Owners are selected from top CL approvals or owners.
They will be suggested to review/approve future CLs.
* OWNERS files are recognized by the new find-owners plugin, see .md files in
https://gerrit.googlesource.com/plugins/find-owners/+/master/src/main/resources/Documentation/
Test: build/make/tools/checkowners.py -c -v OWNERS
Change-Id: Ice402f921c42db160065cf7b8f4bb2dff3717b28
WNERS
ramesequence/OWNERS
|
| de34952ae6022d84c3000a818b6c476b6f85a859 |
15-Mar-2017 |
Leon Scroggins III <scroggo@google.com> |
Merge "Update FrameSequence to call new DGifCloseFile DO NOT MERGE" into mnc-dev am: 7615060ebb am: ac13f98769 am: 56f4ee85a1 am: ee01d6ee14 -s ours am: 1a7b4d220a am: ee7b1350ec am: 8bb744c7b9 am: 75f060c15b am: 02aa2c30cd
am: 5772284099 -s ours
Change-Id: Iebad3da962833679ca7b5d5752b2896d72cc1cf0
|
| 577228409915f80e36a3237e692752d858f644e1 |
15-Mar-2017 |
Leon Scroggins III <scroggo@google.com> |
Merge "Update FrameSequence to call new DGifCloseFile DO NOT MERGE" into mnc-dev am: 7615060ebb am: ac13f98769 am: 56f4ee85a1 am: ee01d6ee14 -s ours am: 1a7b4d220a am: ee7b1350ec am: 8bb744c7b9 am: 75f060c15b
am: 02aa2c30cd
Change-Id: Ic876d191cfb5c3c1209abe92c473b63c1e26036a
|
| 02aa2c30cd506a6dd2cfbb76f4bdca8b39acb215 |
15-Mar-2017 |
Leon Scroggins III <scroggo@google.com> |
Merge "Update FrameSequence to call new DGifCloseFile DO NOT MERGE" into mnc-dev am: 7615060ebb am: ac13f98769 am: 56f4ee85a1 am: ee01d6ee14 -s ours am: 1a7b4d220a am: ee7b1350ec am: 8bb744c7b9
am: 75f060c15b
Change-Id: I6136bd01adad1f5b87eddc5b8630834ca35b896b
|
| 75f060c15b9f4956867e0b53b1a35684d803f638 |
15-Mar-2017 |
Leon Scroggins III <scroggo@google.com> |
Merge "Update FrameSequence to call new DGifCloseFile DO NOT MERGE" into mnc-dev am: 7615060ebb am: ac13f98769 am: 56f4ee85a1 am: ee01d6ee14 -s ours am: 1a7b4d220a am: ee7b1350ec
am: 8bb744c7b9
Change-Id: I6f353afda8c7ee4b6e5626e612a1e862f39b6bb3
|
| 8bb744c7b927dd12a6a89130cde726f3cdcc640e |
15-Mar-2017 |
Leon Scroggins III <scroggo@google.com> |
Merge "Update FrameSequence to call new DGifCloseFile DO NOT MERGE" into mnc-dev am: 7615060ebb am: ac13f98769 am: 56f4ee85a1 am: ee01d6ee14 -s ours am: 1a7b4d220a
am: ee7b1350ec
Change-Id: I327f8fd8b8e5c13abe5f6ef1df4d74bb3b367502
|
| ee7b1350ecce536879e6c5448ce918dabfa0ac5c |
15-Mar-2017 |
Leon Scroggins III <scroggo@google.com> |
Merge "Update FrameSequence to call new DGifCloseFile DO NOT MERGE" into mnc-dev am: 7615060ebb am: ac13f98769 am: 56f4ee85a1 am: ee01d6ee14 -s ours
am: 1a7b4d220a
Change-Id: I8ab009113a544ee79efdaed38b7500b6aa1d9d13
|
| 1a7b4d220add3cb0623ac85234f6ef292040d650 |
15-Mar-2017 |
Leon Scroggins III <scroggo@google.com> |
Merge "Update FrameSequence to call new DGifCloseFile DO NOT MERGE" into mnc-dev am: 7615060ebb am: ac13f98769 am: 56f4ee85a1
am: ee01d6ee14 -s ours
Change-Id: Ic11331d49b0b21ffcdf9195b26282de928f5383b
|
| ee01d6ee1443d0228b6abc110530ffe379914167 |
15-Mar-2017 |
Leon Scroggins III <scroggo@google.com> |
Merge "Update FrameSequence to call new DGifCloseFile DO NOT MERGE" into mnc-dev am: 7615060ebb am: ac13f98769
am: 56f4ee85a1
Change-Id: Ic39d038ed4735ef1ca43f1f4ec9e0e3d3b062e09
|
| 56f4ee85a1cb3035a0dd15420df187c1623970b8 |
15-Mar-2017 |
Leon Scroggins III <scroggo@google.com> |
Merge "Update FrameSequence to call new DGifCloseFile DO NOT MERGE" into mnc-dev am: 7615060ebb
am: ac13f98769
Change-Id: I5e69c8408e2b28c865287b0b027ec14478dd7400
|
| ac13f987693a5dc5ff1b61310204e4abbec4d178 |
15-Mar-2017 |
Leon Scroggins III <scroggo@google.com> |
Merge "Update FrameSequence to call new DGifCloseFile DO NOT MERGE" into mnc-dev
am: 7615060ebb
Change-Id: I95cc319b5859923b6fbab4ad32b203c2b92ac7b1
|
| 7615060ebbe531945fb4bffaa943bf3a96fe68d0 |
15-Mar-2017 |
TreeHugger Robot <treehugger-gerrit@google.com> |
Merge "Update FrameSequence to call new DGifCloseFile DO NOT MERGE" into mnc-dev
|
| c14e942157dde9207af849a1f970b6f52d3e8aac |
14-Mar-2017 |
Leon Scroggins III <scroggo@google.com> |
Update FrameSequence to call new DGifCloseFile DO NOT MERGE am: 56fe3b1ac2 am: 5a745fedc8 -s ours am: 297935b8a9 am: b8ed834b7a am: bdc1826c6c am: ffbf42cd10 -s ours am: e747c9e106 am: 504a330ced am: 632991563c am: 04cef59c7b am: 7802028836
am: d6c0b239f6 -s ours
Change-Id: I9d8cc24bc037d0db08d3687c11388e53b0bec479
|
| d6c0b239f6fa6c1dec5fa4751e3b74ce283c3264 |
14-Mar-2017 |
Leon Scroggins III <scroggo@google.com> |
Update FrameSequence to call new DGifCloseFile DO NOT MERGE am: 56fe3b1ac2 am: 5a745fedc8 -s ours am: 297935b8a9 am: b8ed834b7a am: bdc1826c6c am: ffbf42cd10 -s ours am: e747c9e106 am: 504a330ced am: 632991563c am: 04cef59c7b
am: 7802028836
Change-Id: I0f954f0381d558b85a5a618ef1189ddcd8e1d418
|
| 7802028836c908faaf504cee285d23ed28d472f5 |
14-Mar-2017 |
Leon Scroggins III <scroggo@google.com> |
Update FrameSequence to call new DGifCloseFile DO NOT MERGE am: 56fe3b1ac2 am: 5a745fedc8 -s ours am: 297935b8a9 am: b8ed834b7a am: bdc1826c6c am: ffbf42cd10 -s ours am: e747c9e106 am: 504a330ced am: 632991563c
am: 04cef59c7b
Change-Id: I686a761ed14c7e7d72534f5e94ac671afa69e9c7
|
| 04cef59c7b05731d9e0c4abbd067867f46af9f92 |
14-Mar-2017 |
Leon Scroggins III <scroggo@google.com> |
Update FrameSequence to call new DGifCloseFile DO NOT MERGE am: 56fe3b1ac2 am: 5a745fedc8 -s ours am: 297935b8a9 am: b8ed834b7a am: bdc1826c6c am: ffbf42cd10 -s ours am: e747c9e106 am: 504a330ced
am: 632991563c
Change-Id: I0ff8df65047fb4205ec482a0c35d4a61d9b268ee
|
| 632991563cb90cbc1403d4baf7e88e87299d3faa |
14-Mar-2017 |
Leon Scroggins III <scroggo@google.com> |
Update FrameSequence to call new DGifCloseFile DO NOT MERGE am: 56fe3b1ac2 am: 5a745fedc8 -s ours am: 297935b8a9 am: b8ed834b7a am: bdc1826c6c am: ffbf42cd10 -s ours am: e747c9e106
am: 504a330ced
Change-Id: I0454f8c8307d645b6b9276e27875901470ef87af
|
| 504a330ced11113e405f55b0b616b5176a98c0b5 |
14-Mar-2017 |
Leon Scroggins III <scroggo@google.com> |
Update FrameSequence to call new DGifCloseFile DO NOT MERGE am: 56fe3b1ac2 am: 5a745fedc8 -s ours am: 297935b8a9 am: b8ed834b7a am: bdc1826c6c am: ffbf42cd10 -s ours
am: e747c9e106
Change-Id: I3e295a462132bb605655886a3916ae8b0057e5a7
|
| e747c9e10636ec8ea09a03c9865feee213e7eb28 |
14-Mar-2017 |
Leon Scroggins III <scroggo@google.com> |
Update FrameSequence to call new DGifCloseFile DO NOT MERGE am: 56fe3b1ac2 am: 5a745fedc8 -s ours am: 297935b8a9 am: b8ed834b7a am: bdc1826c6c
am: ffbf42cd10 -s ours
Change-Id: I4be2028a293c13df9159e0d1aac26e4a1b43c951
|
| ffbf42cd10eeacb38c1b5a04ff3416035ab3d128 |
14-Mar-2017 |
Leon Scroggins III <scroggo@google.com> |
Update FrameSequence to call new DGifCloseFile DO NOT MERGE am: 56fe3b1ac2 am: 5a745fedc8 -s ours am: 297935b8a9 am: b8ed834b7a
am: bdc1826c6c
Change-Id: I32d9821d53db28677026ba8b19b7a8734e48b6e9
|
| bdc1826c6c0628952dca396b2ca28029b35ff7a7 |
14-Mar-2017 |
Leon Scroggins III <scroggo@google.com> |
Update FrameSequence to call new DGifCloseFile DO NOT MERGE am: 56fe3b1ac2 am: 5a745fedc8 -s ours am: 297935b8a9
am: b8ed834b7a
Change-Id: Ic84af8bb837345cb10d3335c0464b2976470bdac
|
| b8ed834b7a6e9c47ff025a3003dadc2a2b8e7b0c |
14-Mar-2017 |
Leon Scroggins III <scroggo@google.com> |
Update FrameSequence to call new DGifCloseFile DO NOT MERGE am: 56fe3b1ac2 am: 5a745fedc8 -s ours
am: 297935b8a9
Change-Id: Ic606e80c2dc184fd1ea47435fabf469bdb7774e5
|
| 297935b8a978a1b0169e292828005b1c2b90663d |
14-Mar-2017 |
Leon Scroggins III <scroggo@google.com> |
Update FrameSequence to call new DGifCloseFile DO NOT MERGE am: 56fe3b1ac2
am: 5a745fedc8 -s ours
Change-Id: I8a727f8931b83211696760bfd77a732659f6aaa0
|
| 5a745fedc8c89c93cab3e935f805a56445b4f372 |
14-Mar-2017 |
Leon Scroggins III <scroggo@google.com> |
Update FrameSequence to call new DGifCloseFile DO NOT MERGE
am: 56fe3b1ac2
Change-Id: Ibf0d0b84580ce61dd5be87f2b7c6226bc65b1c85
|
| 444b4b659d1166a7bcfda314d199c68c8c27cf24 |
14-Mar-2017 |
Leon Scroggins III <scroggo@google.com> |
Update FrameSequence to call new DGifCloseFile DO NOT MERGE am: 42e6a0b6f3 -s ours am: 3bcb5561df am: c5f58e4d7b -s ours am: fb6104f721 am: 611887def9 am: d4dd64a5ea am: 622730733b -s ours am: e138939b6d am: bb87b7dd5b am: cafa2be492 am: 1a5851c62c am: 5e190b9cc6
am: 6bf8983805 -s ours
Change-Id: I9e88a3b974f85740d7dccefe1a08f4b7d86e7315
|
| 6bf8983805c5c268db332d89260503d0a7e1cd79 |
14-Mar-2017 |
Leon Scroggins III <scroggo@google.com> |
Update FrameSequence to call new DGifCloseFile DO NOT MERGE am: 42e6a0b6f3 -s ours am: 3bcb5561df am: c5f58e4d7b -s ours am: fb6104f721 am: 611887def9 am: d4dd64a5ea am: 622730733b -s ours am: e138939b6d am: bb87b7dd5b am: cafa2be492 am: 1a5851c62c
am: 5e190b9cc6
Change-Id: If7814a252e4e869bab42cfcd2bd698806da1b25c
|
| 5e190b9cc6af995b97bf7e6036d8467d6ed94a41 |
14-Mar-2017 |
Leon Scroggins III <scroggo@google.com> |
Update FrameSequence to call new DGifCloseFile DO NOT MERGE am: 42e6a0b6f3 -s ours am: 3bcb5561df am: c5f58e4d7b -s ours am: fb6104f721 am: 611887def9 am: d4dd64a5ea am: 622730733b -s ours am: e138939b6d am: bb87b7dd5b am: cafa2be492
am: 1a5851c62c
Change-Id: I1147da8abded763678c882b93bd7cd699fadc8ec
|
| 1a5851c62c75ced028a396111fcd5288e1c9ae8e |
14-Mar-2017 |
Leon Scroggins III <scroggo@google.com> |
Update FrameSequence to call new DGifCloseFile DO NOT MERGE am: 42e6a0b6f3 -s ours am: 3bcb5561df am: c5f58e4d7b -s ours am: fb6104f721 am: 611887def9 am: d4dd64a5ea am: 622730733b -s ours am: e138939b6d am: bb87b7dd5b
am: cafa2be492
Change-Id: I0b6b65c8db8d62d691aeb23601224ae2007c1c54
|
| cafa2be492603e76f93aa526ca8190d9792b481d |
14-Mar-2017 |
Leon Scroggins III <scroggo@google.com> |
Update FrameSequence to call new DGifCloseFile DO NOT MERGE am: 42e6a0b6f3 -s ours am: 3bcb5561df am: c5f58e4d7b -s ours am: fb6104f721 am: 611887def9 am: d4dd64a5ea am: 622730733b -s ours am: e138939b6d
am: bb87b7dd5b
Change-Id: Ib84240b755c1adfe46a705ef8c9f36d0bb8adcee
|
| bb87b7dd5b3b0252ceb2d6d8402d2b0f803543b7 |
14-Mar-2017 |
Leon Scroggins III <scroggo@google.com> |
Update FrameSequence to call new DGifCloseFile DO NOT MERGE am: 42e6a0b6f3 -s ours am: 3bcb5561df am: c5f58e4d7b -s ours am: fb6104f721 am: 611887def9 am: d4dd64a5ea am: 622730733b -s ours
am: e138939b6d
Change-Id: I84b3c8a6c73f9d5291523a3326c168380444ac0c
|
| e138939b6d0bfa689473386bef4d48bab2e55d4c |
14-Mar-2017 |
Leon Scroggins III <scroggo@google.com> |
Update FrameSequence to call new DGifCloseFile DO NOT MERGE am: 42e6a0b6f3 -s ours am: 3bcb5561df am: c5f58e4d7b -s ours am: fb6104f721 am: 611887def9 am: d4dd64a5ea
am: 622730733b -s ours
Change-Id: I92794f34f86678e6c2620767e54bd51f687ed97d
|
| 622730733b39d7b068bef8608ef8e9c710879d9c |
14-Mar-2017 |
Leon Scroggins III <scroggo@google.com> |
Update FrameSequence to call new DGifCloseFile DO NOT MERGE am: 42e6a0b6f3 -s ours am: 3bcb5561df am: c5f58e4d7b -s ours am: fb6104f721 am: 611887def9
am: d4dd64a5ea
Change-Id: Ifa58c414ab753b0f85fe46d48de4b6d84e9ad862
|
| d4dd64a5ea368c0a301a9a84dcf4f34ea967c19a |
14-Mar-2017 |
Leon Scroggins III <scroggo@google.com> |
Update FrameSequence to call new DGifCloseFile DO NOT MERGE am: 42e6a0b6f3 -s ours am: 3bcb5561df am: c5f58e4d7b -s ours am: fb6104f721
am: 611887def9
Change-Id: I4a49eb3f3e3858599792318604ac471f44e85d20
|
| 611887def93bdfb4ba099bb701ab8013d56bf40b |
14-Mar-2017 |
Leon Scroggins III <scroggo@google.com> |
Update FrameSequence to call new DGifCloseFile DO NOT MERGE am: 42e6a0b6f3 -s ours am: 3bcb5561df am: c5f58e4d7b -s ours
am: fb6104f721
Change-Id: I90ff071f212be7508a370f122bb2f2cab82ee3d9
|
| fb6104f721be5087bcde46ebafd474a6680e3ea2 |
14-Mar-2017 |
Leon Scroggins III <scroggo@google.com> |
Update FrameSequence to call new DGifCloseFile DO NOT MERGE am: 42e6a0b6f3 -s ours am: 3bcb5561df
am: c5f58e4d7b -s ours
Change-Id: Ic6bebf0f29655e8e9d8843c687905d5cfe2dfe93
|
| c5f58e4d7ba8b7700c197899f7dd93f2a197edc0 |
14-Mar-2017 |
Leon Scroggins III <scroggo@google.com> |
Update FrameSequence to call new DGifCloseFile DO NOT MERGE am: 42e6a0b6f3 -s ours
am: 3bcb5561df
Change-Id: Ib441b883a7f298ef6b802599f09114abe9d1add3
|
| 56fe3b1ac23032870e3dfedcb97cf381c6f3a705 |
14-Mar-2017 |
Leon Scroggins III <scroggo@google.com> |
Update FrameSequence to call new DGifCloseFile DO NOT MERGE
Bug:34697653
Test: build; existing CTS tests
This version takes two parameters.
Matches commit 164b6937223c9f9cbb84b213740e3e80f940b193
Change-Id: I0ef4b68f75dba5c58d3e2b53a13138d248cbab0d
(cherry picked from commit 42e6a0b6f362abf579e1f179d9c797831b7a7e5c)
ramesequence/jni/FrameSequence_gif.cpp
|
| 3bcb5561dfaf8feefbe6435e7b14285ae037f46e |
14-Mar-2017 |
Leon Scroggins III <scroggo@google.com> |
Update FrameSequence to call new DGifCloseFile DO NOT MERGE
am: 42e6a0b6f3 -s ours
Change-Id: I21eb2a5715b2dd52ee9c957938fbe7155e1c8576
|
| e81d3acbc1440f9ea0a61edbdafa0b7354de6351 |
14-Mar-2017 |
Leon Scroggins III <scroggo@google.com> |
Update FrameSequence to call new DGifCloseFile DO NOT MERGE
Bug:34697653
Test: build; existing CTS tests
This version takes two parameters.
Matches commit 164b6937223c9f9cbb84b213740e3e80f940b193
Change-Id: I062a6d6d3c5dfd41d46d3fa2a5aa18ab27ecabf8
ramesequence/jni/FrameSequence_gif.cpp
|
| 42e6a0b6f362abf579e1f179d9c797831b7a7e5c |
14-Mar-2017 |
Leon Scroggins III <scroggo@google.com> |
Update FrameSequence to call new DGifCloseFile DO NOT MERGE
Bug:34697653
Test: build; existing CTS tests
This version takes two parameters.
Matches commit 164b6937223c9f9cbb84b213740e3e80f940b193
Change-Id: I0ef4b68f75dba5c58d3e2b53a13138d248cbab0d
ramesequence/jni/FrameSequence_gif.cpp
|
| bf39f791ab7c79457de2c2f21ac2260a6754c029 |
01-Mar-2017 |
Sheng-Hao Tsao <shenghao@google.com> |
Fix the bug that camera can't open again after disconnected
Reproduce steps:
1. Open android default camera
2. Open chrome camera app
3. Close chrome camera app
4. Android camera app is disconnected. Close it.
5. Open android camera app again. It can't open camera anymore.
The root cause is that camera state is set to invalid after getting
an exception in step 4. We should not invalidate the camera.
BUG=35411023
TEST=In samus, verify that camera can be opened after the above steps
Change-Id: I63bcc3587d1c7970c1bad8bffa628fa579f831ef
(cherry picked from commit a822d5c3528473582de6b2f9db0bee3ea2a18190)
amera2/portability/src/com/android/ex/camera2/portability/AndroidCameraAgentImpl.java
|
| 7921659d7096a618634153ca7fed88e8563e03f5 |
02-Mar-2017 |
Sheng-hao Tsao <shenghao@google.com> |
Revert "Fix the bug that camera can't open again after disconnected"
This reverts commit 03e6dacb31332de191a1190a6b6f7d948f6536ef.
Change-Id: I469085d6993a6005f3487a3a33327bdaac498993
amera2/portability/src/com/android/ex/camera2/portability/AndroidCameraAgentImpl.java
amera2/portability/src/com/android/ex/camera2/portability/CameraStateHolder.java
|
| 03e6dacb31332de191a1190a6b6f7d948f6536ef |
23-Feb-2017 |
Sheng-Hao Tsao <shenghao@google.com> |
Fix the bug that camera can't open again after disconnected
Reproduce steps:
1. Open android default camera
2. Open chrome camera app
3. Close chrome camera app
4. Android camera app is disconnected. Close it.
5. Open android camera app again. It can't open camera anymore.
The root cause is that camera state is set to invalid after getting
an exception in step 4. We should allow opening camera even if
the state is invalid.
BUG=35411023
TEST=In elm, verify that camera can be opened after the above steps
Change-Id: Ie9e64cf826a3510b5fa76b14f7f4110e5a015b64
(cherry picked from commit 5d61737fe19ad69d41d94e2660053e82d0aa3dc5)
amera2/portability/src/com/android/ex/camera2/portability/AndroidCameraAgentImpl.java
amera2/portability/src/com/android/ex/camera2/portability/CameraStateHolder.java
|
| 0fc3c4277d0bb9a0da3e7292f350b2f6e3070e0b |
12-Jan-2017 |
Chris Craik <ccraik@google.com> |
Merge "resolve merge conflicts of 89cdd4cb to mnc-dev am: d2fd12358d am: 684a68075e am: bf0a8eefb0 am: 51e1a563a3 am: 8906021aec am: 7901c75979 am: 200bf8583d am: d3a5ff7bfe am: 560a158972" into nyc-mr2-dev-plus-aosp
am: 552350d39a
Change-Id: Ib94b70fad44074ca4a4b29d5c93f5f0b74ce41e4
|
| 6ce2cb81a57132432454e42b5da3a9745c532167 |
12-Jan-2017 |
Chris Craik <ccraik@google.com> |
resolve merge conflicts of 89cdd4cb to mnc-dev am: d2fd12358d am: 684a68075e am: bf0a8eefb0 am: 51e1a563a3 am: 8906021aec am: 7901c75979 am: 200bf8583d am: d3a5ff7bfe am: 560a158972
am: bd16b681ba
Change-Id: I197e9fd9b9e00ab67e1dd510167db911498a8ac7
|
| 1af69efcf5955d8a4ea88927f77baea7af89aa08 |
12-Jan-2017 |
Chris Craik <ccraik@google.com> |
resolve merge conflicts of 89cdd4cb to mnc-dev am: d2fd12358d am: 684a68075e am: bf0a8eefb0 am: 51e1a563a3 am: 8906021aec am: 7901c75979 am: 200bf8583d am: d3a5ff7bfe am: f597bbffa6
am: a24991c48f
Change-Id: Id23a1c1455c1b7a6db4ed6242d742c8305f3edf0
|
| 552350d39a06d2a7d3fa3ea0b051c194bd9e88a0 |
12-Jan-2017 |
Android Build Merger (Role) <android-build-merger@google.com> |
Merge "resolve merge conflicts of 89cdd4cb to mnc-dev am: d2fd12358d am: 684a68075e am: bf0a8eefb0 am: 51e1a563a3 am: 8906021aec am: 7901c75979 am: 200bf8583d am: d3a5ff7bfe am: 560a158972" into nyc-mr2-dev-plus-aosp
|
| bd16b681ba4147e0e1ff029e98de10e67aea8a02 |
12-Jan-2017 |
Chris Craik <ccraik@google.com> |
resolve merge conflicts of 89cdd4cb to mnc-dev am: d2fd12358d am: 684a68075e am: bf0a8eefb0 am: 51e1a563a3 am: 8906021aec am: 7901c75979 am: 200bf8583d am: d3a5ff7bfe
am: 560a158972
Change-Id: If427dbb67ca3ce026c96d575ad17aac524ee8fe4
|
| a24991c48f0bf8562cf64db52376afd1a5b2174d |
12-Jan-2017 |
Chris Craik <ccraik@google.com> |
resolve merge conflicts of 89cdd4cb to mnc-dev am: d2fd12358d am: 684a68075e am: bf0a8eefb0 am: 51e1a563a3 am: 8906021aec am: 7901c75979 am: 200bf8583d am: d3a5ff7bfe
am: f597bbffa6
Change-Id: I21956c8ea41beef73447ab3bacd82ff55086b88d
|
| 560a1589720463d2311b753f2f0f901c1097cedf |
12-Jan-2017 |
Chris Craik <ccraik@google.com> |
resolve merge conflicts of 89cdd4cb to mnc-dev am: d2fd12358d am: 684a68075e am: bf0a8eefb0 am: 51e1a563a3 am: 8906021aec am: 7901c75979 am: 200bf8583d
am: d3a5ff7bfe
Change-Id: Ib3be3c1f13a44774517db8ac72cb79c56f580579
|
| f597bbffa63b7aab1c6fb82cc8b0997ca64a0e99 |
12-Jan-2017 |
Chris Craik <ccraik@google.com> |
resolve merge conflicts of 89cdd4cb to mnc-dev am: d2fd12358d am: 684a68075e am: bf0a8eefb0 am: 51e1a563a3 am: 8906021aec am: 7901c75979 am: 200bf8583d
am: d3a5ff7bfe
Change-Id: Ifeba807b84a2d18184eb330c21cdfc1808ffdbdb
|
| d3a5ff7bfeb361e8d2e808a2c8c5b864a181d5f7 |
12-Jan-2017 |
Chris Craik <ccraik@google.com> |
resolve merge conflicts of 89cdd4cb to mnc-dev am: d2fd12358d am: 684a68075e am: bf0a8eefb0 am: 51e1a563a3 am: 8906021aec am: 7901c75979
am: 200bf8583d
Change-Id: I98bb2d48abf0300bc235c31599f4ebf700033138
|
| 200bf8583df451a54a0da267ead961664b1b2007 |
12-Jan-2017 |
Chris Craik <ccraik@google.com> |
resolve merge conflicts of 89cdd4cb to mnc-dev am: d2fd12358d am: 684a68075e am: bf0a8eefb0 am: 51e1a563a3 am: 8906021aec
am: 7901c75979
Change-Id: If36dbf5297e87e0e95aafc058b1e839d69cd9240
|
| 7901c75979f93a18ed78b455ad9ea31495fbf2a1 |
12-Jan-2017 |
Chris Craik <ccraik@google.com> |
resolve merge conflicts of 89cdd4cb to mnc-dev am: d2fd12358d am: 684a68075e am: bf0a8eefb0 am: 51e1a563a3
am: 8906021aec
Change-Id: I12f009bc41c7d3ea0e1799bc14731412f5157a40
|
| 8906021aecba5342eb3972d1454c34bef254f8c4 |
12-Jan-2017 |
Chris Craik <ccraik@google.com> |
resolve merge conflicts of 89cdd4cb to mnc-dev am: d2fd12358d am: 684a68075e am: bf0a8eefb0
am: 51e1a563a3
Change-Id: I49c7365bdbbc35ccd9172a8a5975985677f0589c
|
| 51e1a563a3ba88b8e5f8337f502457890095b98b |
12-Jan-2017 |
Chris Craik <ccraik@google.com> |
resolve merge conflicts of 89cdd4cb to mnc-dev am: d2fd12358d am: 684a68075e
am: bf0a8eefb0
Change-Id: I646c4b1dfa186630995b8ff3e3fca06c8661699f
|
| bf0a8eefb056ef9f65d443cf3bb77a41104a1277 |
12-Jan-2017 |
Chris Craik <ccraik@google.com> |
resolve merge conflicts of 89cdd4cb to mnc-dev am: d2fd12358d
am: 684a68075e
Change-Id: Ia0caa4a687befe60bd36199f2921c55ca76d271e
|
| 684a68075e5613884a4ef1165a93e2e7d213fbd5 |
12-Jan-2017 |
Chris Craik <ccraik@google.com> |
resolve merge conflicts of 89cdd4cb to mnc-dev
am: d2fd12358d
Change-Id: Ie2dde644caa0af42ee7b78fb82e50e1b498f4b12
|
| d2fd12358d35eb999ef8b92b1dcce07f7be15fc3 |
12-Jan-2017 |
Chris Craik <ccraik@google.com> |
resolve merge conflicts of 89cdd4cb to mnc-dev
Change-Id: Ie1421dc0fed3c3a20c5c146a253b27b8678a6207
|
| 89cdd4cbcc47d60a70c0625d8a65490fd3becb12 |
12-Jan-2017 |
Chris Craik <ccraik@google.com> |
Handle small sized webps correctly am: 88a377408b
am: a489de64b7
Change-Id: I9a31796def02915eb122315ba0d4dcb96ff23ceb
|
| a489de64b773d3f697a6f6f9ddcf8bfb7a3ad0a7 |
12-Jan-2017 |
Chris Craik <ccraik@google.com> |
Handle small sized webps correctly
am: 88a377408b
Change-Id: I33b429ab240b6113481e9ccb1e771574b61815e4
|
| a45d7b67fb61bc50893551687c0acd2be341e9d6 |
12-Jan-2017 |
Chris Craik <ccraik@google.com> |
Merge "Fix webp iterator indexing for frame timing" am: bdaaa4e7a8 am: 7efa206ba9 am: 0b33dbff23
am: 97393adb08
Change-Id: I4bebcab259f6cc65efa3f83c9cbf5f5b3304361c
|
| 97393adb08c55fc9c6ebf54ef8f6feb6803211b8 |
12-Jan-2017 |
Chris Craik <ccraik@google.com> |
Merge "Fix webp iterator indexing for frame timing" am: bdaaa4e7a8 am: 7efa206ba9
am: 0b33dbff23
Change-Id: I3119a87d4167b1ed432055c6429a1b477f4f9c37
|
| 0b33dbff239b2ed7c6f5472151b9255012d478f4 |
12-Jan-2017 |
Chris Craik <ccraik@google.com> |
Merge "Fix webp iterator indexing for frame timing" am: bdaaa4e7a8
am: 7efa206ba9
Change-Id: Ib1028553d292b049ef522ffbb0011ec4e42e9e8d
|
| 7efa206ba93b8597ffdd28ef5d8187f7f1ccc3de |
12-Jan-2017 |
Chris Craik <ccraik@google.com> |
Merge "Fix webp iterator indexing for frame timing"
am: bdaaa4e7a8
Change-Id: Ibceddbe617cd9c4c07a0158053d93266ae4d55bd
|
| bdaaa4e7a8f6a531616636893d28277891b06e9f |
12-Jan-2017 |
Treehugger Robot <treehugger-gerrit@google.com> |
Merge "Fix webp iterator indexing for frame timing"
|
| aad6eca4450f0d4737b5efe0d7c8404a6944b6b1 |
12-Jan-2017 |
Chris Craik <ccraik@google.com> |
Fix webp iterator indexing for frame timing
Bug: 34223866
Test: manual
Fixes issue where we use the delay from the wrong frame.
Change-Id: Ia4435d560053c9c383aeddc369434ddd3c7ba4c6
ramesequence/jni/FrameSequence_webp.cpp
|
| 88a377408b394cad10f40f2d1b731e97ce06f0a3 |
11-Jan-2017 |
Chris Craik <ccraik@google.com> |
Handle small sized webps correctly
bug:33718716
Change-Id: I54d63d54c7057828dfca1ab4ef47a44760e94ece
ramesequence/jni/FrameSequence_webp.cpp
|
| 216417de2876626d157758ae2c6d06ac64e5850b |
24-Nov-2016 |
Chris Craik <ccraik@google.com> |
resolve merge conflicts of 3802db4 to mnc-dev am: fffaa9f25e am: 794a2883b1 am: 7f28ac3755 am: 32cbf9ace0 am: ef31156a54 am: b4d78c7f4a am: 380440a870 am: dce18cc89a am: 2bc9b99394
am: bd26812c3c
Change-Id: I30e55b04f6d44590e80ceed8f343cf2e0f9f5167
|
| bd26812c3c3d67d4d90d6bfda78b5ea26a605970 |
24-Nov-2016 |
Chris Craik <ccraik@google.com> |
resolve merge conflicts of 3802db4 to mnc-dev am: fffaa9f25e am: 794a2883b1 am: 7f28ac3755 am: 32cbf9ace0 am: ef31156a54 am: b4d78c7f4a am: 380440a870 am: dce18cc89a
am: 2bc9b99394
Change-Id: Iee34df48427c3dd7bbb6476cab6f9d9552c827bd
|
| 2bc9b9939403a9d430744ad48c85d38847ad3000 |
24-Nov-2016 |
Chris Craik <ccraik@google.com> |
resolve merge conflicts of 3802db4 to mnc-dev am: fffaa9f25e am: 794a2883b1 am: 7f28ac3755 am: 32cbf9ace0 am: ef31156a54 am: b4d78c7f4a am: 380440a870
am: dce18cc89a
Change-Id: Icb8c1549aeaa51966b875de9b5cbd0bfd83b1343
|
| 043646b728ddc722d85296d03848ec1979472495 |
16-Nov-2016 |
Chris Craik <ccraik@google.com> |
resolve merge conflicts of 3802db4 to mnc-dev am: fffaa9f25e am: 794a2883b1 am: 7f28ac3755 am: 32cbf9ace0 am: ef31156a54 am: b4d78c7f4a am: 380440a870 am: dce18cc89a am: 589067bb9d
am: 1eb5d612c4
Change-Id: I1325126998fe1b296200b450f4c6acf42294727d
|
| 1eb5d612c480578a83a754a0bcb21fa8172016dd |
16-Nov-2016 |
Chris Craik <ccraik@google.com> |
resolve merge conflicts of 3802db4 to mnc-dev am: fffaa9f25e am: 794a2883b1 am: 7f28ac3755 am: 32cbf9ace0 am: ef31156a54 am: b4d78c7f4a am: 380440a870 am: dce18cc89a
am: 589067bb9d
Change-Id: I8abe6cd3102e16bb50a6c76fbe1ed7f515caa932
|
| 589067bb9dbc1e18cc64e6255abccfcbe8224aba |
16-Nov-2016 |
Chris Craik <ccraik@google.com> |
resolve merge conflicts of 3802db4 to mnc-dev am: fffaa9f25e am: 794a2883b1 am: 7f28ac3755 am: 32cbf9ace0 am: ef31156a54 am: b4d78c7f4a am: 380440a870
am: dce18cc89a
Change-Id: I1ef9a2e59759f17c35182d150225b3c77ab689b2
|
| dce18cc89af0ef7e48b9b765e985a9555ce33378 |
16-Nov-2016 |
Chris Craik <ccraik@google.com> |
resolve merge conflicts of 3802db4 to mnc-dev am: fffaa9f25e am: 794a2883b1 am: 7f28ac3755 am: 32cbf9ace0 am: ef31156a54 am: b4d78c7f4a
am: 380440a870
Change-Id: I52f26d32957da6b846597d3160d92ffe0e47d7fa
|
| 380440a8706a6a28f672842c06ac73bdca5e5d78 |
16-Nov-2016 |
Chris Craik <ccraik@google.com> |
resolve merge conflicts of 3802db4 to mnc-dev am: fffaa9f25e am: 794a2883b1 am: 7f28ac3755 am: 32cbf9ace0 am: ef31156a54
am: b4d78c7f4a
Change-Id: I77a372127a524c7e80c636fa4944be7be5a05ec5
|
| b4d78c7f4a5e96f79640ad5e8ed33ef6ca0e568b |
16-Nov-2016 |
Chris Craik <ccraik@google.com> |
resolve merge conflicts of 3802db4 to mnc-dev am: fffaa9f25e am: 794a2883b1 am: 7f28ac3755 am: 32cbf9ace0
am: ef31156a54
Change-Id: I80b626495fe3d7af760f81284d64c3c02cc150f4
|
| ef31156a5462c3eef96b3aaa4e4578483e0c083c |
16-Nov-2016 |
Chris Craik <ccraik@google.com> |
resolve merge conflicts of 3802db4 to mnc-dev am: fffaa9f25e am: 794a2883b1 am: 7f28ac3755
am: 32cbf9ace0
Change-Id: Ie146529171bfc17dea3e2c34bf6ca692f1c191c0
|
| 32cbf9ace0c4b29b6c5ca1fdafb0388a1bfdcaa0 |
16-Nov-2016 |
Chris Craik <ccraik@google.com> |
resolve merge conflicts of 3802db4 to mnc-dev am: fffaa9f25e am: 794a2883b1
am: 7f28ac3755
Change-Id: I3b0eed8ef6f22065e5623b27cab0fac5f1b337da
|
| 7f28ac3755a3e2106a77d05933db81581e2f14d7 |
16-Nov-2016 |
Chris Craik <ccraik@google.com> |
resolve merge conflicts of 3802db4 to mnc-dev am: fffaa9f25e
am: 794a2883b1
Change-Id: I0850058268c635b00adbe085a3a192623cdb464c
|
| 794a2883b188503f3009fcc5151b7a313fec7d8a |
16-Nov-2016 |
Chris Craik <ccraik@google.com> |
resolve merge conflicts of 3802db4 to mnc-dev
am: fffaa9f25e
Change-Id: I61775c7ecf911b9dad7b48c25eab6f2a7582644a
|
| fffaa9f25edddc6fa10512c1cc19f625c2abee8c |
16-Nov-2016 |
Chris Craik <ccraik@google.com> |
resolve merge conflicts of 3802db4 to mnc-dev
bug:32338390
Change-Id: I304c0c8c646808e690918eae7d34f0852e2b0fa8
|
| 3802db41927c5aeeff9843d69bb827d1adf534ef |
16-Nov-2016 |
Chris Craik <ccraik@google.com> |
Handle size correctly from webp header am: c6eca849a1
am: 698f277c0e
Change-Id: Idc3a8ee9034fa9bdd2337a8814013b0ab04665d2
|
| 698f277c0e5383db1edb2e478940ad29fc44ec97 |
16-Nov-2016 |
Chris Craik <ccraik@google.com> |
Handle size correctly from webp header
am: c6eca849a1
Change-Id: I74c248036741094d81ce4fc17f981f82b173602b
|
| c6eca849a1d737fe7c0d397fb8265584d1e34226 |
15-Nov-2016 |
Chris Craik <ccraik@google.com> |
Handle size correctly from webp header
bug:32338390
Change-Id: I8d79692c72fdc3b0cba5342179b0f30a21bae094
ramesequence/jni/FrameSequence_webp.cpp
ramesequence/jni/FrameSequence_webp.h
|
| 55ee348616472c36b1941870556044bdbc7f5458 |
28-Oct-2016 |
Dan Willemsen <dwillemsen@google.com> |
Merge "Revert "Revert "Revert "Camera2: Use hidden APIs"""" am: 6033321c6f am: 156dc3b883 am: 5c2d5d4549
am: 98cfb87a97
Change-Id: I61d2e654ca0dbcdbb10c464dbdbaeb38eb7b16dc
|
| 98cfb87a97c2b608981e7190c3963acff5018036 |
28-Oct-2016 |
Dan Willemsen <dwillemsen@google.com> |
Merge "Revert "Revert "Revert "Camera2: Use hidden APIs"""" am: 6033321c6f am: 156dc3b883
am: 5c2d5d4549
Change-Id: I34780c1349e53eb4c1972dd9b1e4f016f9ab0ece
|
| 5c2d5d4549dc51e6024b57727162d10bb71a0c96 |
28-Oct-2016 |
Dan Willemsen <dwillemsen@google.com> |
Merge "Revert "Revert "Revert "Camera2: Use hidden APIs"""" am: 6033321c6f
am: 156dc3b883
Change-Id: Ie2b1caf0b64f54cdabcd4973fa3d7096663d7dab
|
| 156dc3b8839e9371a6efa3ef2dc90d85495c1335 |
28-Oct-2016 |
Dan Willemsen <dwillemsen@google.com> |
Merge "Revert "Revert "Revert "Camera2: Use hidden APIs""""
am: 6033321c6f
Change-Id: Iecace490bf08078caff7614f7ad1460e56349380
|
| 6033321c6f8305aa2f35b6f9c33169d69ec6fc91 |
28-Oct-2016 |
Treehugger Robot <treehugger-gerrit@google.com> |
Merge "Revert "Revert "Revert "Camera2: Use hidden APIs""""
|
| a26632ef83df8e8a727641998876fa2043f06611 |
20-Oct-2016 |
Shuzhen Wang <shuzhenwang@google.com> |
Merge "camera2: Add onCaptureQueueEmpty callback"
|
| cf4686fd094ea6270e2c0d797f3b9c7f114e9b35 |
18-Oct-2016 |
Chris Craik <ccraik@google.com> |
Handle color bounds correctly in GIF decode. am: 0ada9456d0 am: ec73b0bbc7 am: a7d4e89c4b am: 2fc0b7cc6c am: df56c4e613 am: 8b79a54199 am: d0eb7d1d99 am: 2889101573 am: 4d394a5d94 am: 05d50538e0 am: d8d49b802e
am: 1e52214c2b
Change-Id: I71931a384d323acc2e258a710c07d92b168ffcc6
|
| 1e52214c2b3b4d4371084c9a7a6a8899a5da1645 |
18-Oct-2016 |
Chris Craik <ccraik@google.com> |
Handle color bounds correctly in GIF decode. am: 0ada9456d0 am: ec73b0bbc7 am: a7d4e89c4b am: 2fc0b7cc6c am: df56c4e613 am: 8b79a54199 am: d0eb7d1d99 am: 2889101573 am: 4d394a5d94 am: 05d50538e0
am: d8d49b802e
Change-Id: I39159ef94d6c19538e1fb0c030f05fc8a7e2a60e
|
| d8d49b802e9b9cacaa5a76d033428ab0d6f134e5 |
18-Oct-2016 |
Chris Craik <ccraik@google.com> |
Handle color bounds correctly in GIF decode. am: 0ada9456d0 am: ec73b0bbc7 am: a7d4e89c4b am: 2fc0b7cc6c am: df56c4e613 am: 8b79a54199 am: d0eb7d1d99 am: 2889101573 am: 4d394a5d94
am: 05d50538e0
Change-Id: Ic2f68a088bf00813bd2c39decde82cfc2d7c81dc
|
| 05d50538e01e65538263f5e758316caa487e4a0f |
18-Oct-2016 |
Chris Craik <ccraik@google.com> |
Handle color bounds correctly in GIF decode. am: 0ada9456d0 am: ec73b0bbc7 am: a7d4e89c4b am: 2fc0b7cc6c am: df56c4e613 am: 8b79a54199 am: d0eb7d1d99 am: 2889101573
am: 4d394a5d94
Change-Id: Ie2bb7b07c11fb27e29e815a6fc4204bafab67e53
|
| 4d394a5d94e8470f0caeeceaf2658f63f2fdd20a |
18-Oct-2016 |
Chris Craik <ccraik@google.com> |
Handle color bounds correctly in GIF decode. am: 0ada9456d0 am: ec73b0bbc7 am: a7d4e89c4b am: 2fc0b7cc6c am: df56c4e613 am: 8b79a54199 am: d0eb7d1d99
am: 2889101573
Change-Id: Idf3f84693f6cf98cc51309a708d2ea88a3cdbb58
|
| 2889101573f3bc680198e3cffac49f118d24051a |
18-Oct-2016 |
Chris Craik <ccraik@google.com> |
Handle color bounds correctly in GIF decode. am: 0ada9456d0 am: ec73b0bbc7 am: a7d4e89c4b am: 2fc0b7cc6c am: df56c4e613 am: 8b79a54199
am: d0eb7d1d99
Change-Id: Ifb12184a28597e4a93a28f24117efee42ba2035a
|
| d0eb7d1d99b20109e8646fb01b3ffb3aaaf035c6 |
18-Oct-2016 |
Chris Craik <ccraik@google.com> |
Handle color bounds correctly in GIF decode. am: 0ada9456d0 am: ec73b0bbc7 am: a7d4e89c4b am: 2fc0b7cc6c am: df56c4e613
am: 8b79a54199
Change-Id: If6d77edfbbefa855f79d8fdb077c47945efa8ead
|
| 8b79a541999a314fc63e6212a8aec997d5ff99af |
18-Oct-2016 |
Chris Craik <ccraik@google.com> |
Handle color bounds correctly in GIF decode. am: 0ada9456d0 am: ec73b0bbc7 am: a7d4e89c4b am: 2fc0b7cc6c
am: df56c4e613
Change-Id: I52a4cff5ed2ca3b560aa96ecfb2f25f5d8803659
|
| df56c4e6130ab8dd4172b5e5242a469715336939 |
18-Oct-2016 |
Chris Craik <ccraik@google.com> |
Handle color bounds correctly in GIF decode. am: 0ada9456d0 am: ec73b0bbc7 am: a7d4e89c4b
am: 2fc0b7cc6c
Change-Id: Ic935159a43f29bee0db96a78a64496e797f57476
|
| 2fc0b7cc6cddfb1d1852579865c186f002e50a54 |
18-Oct-2016 |
Chris Craik <ccraik@google.com> |
Handle color bounds correctly in GIF decode. am: 0ada9456d0 am: ec73b0bbc7
am: a7d4e89c4b
Change-Id: I6594694f91873e1669d374d4f88514495f863688
|
| a7d4e89c4b051ff99e4d760618a11d7c76ca0040 |
18-Oct-2016 |
Chris Craik <ccraik@google.com> |
Handle color bounds correctly in GIF decode. am: 0ada9456d0
am: ec73b0bbc7
Change-Id: I7b408db5cc48f1f720575d4c2921103dec5db6d9
|
| ec73b0bbc728a90f39dc776b6cfb1a55d3fd2d08 |
18-Oct-2016 |
Chris Craik <ccraik@google.com> |
Handle color bounds correctly in GIF decode.
am: 0ada9456d0
Change-Id: I26325be8f2d30fbf5c309772125e8a1ff431dfff
|
| 0ada9456d0270cb0e357a43d9187a6418d770760 |
18-Oct-2016 |
Chris Craik <ccraik@google.com> |
Handle color bounds correctly in GIF decode.
Bug: 31631842
Change-Id: Ia4d25d9cd440286366f82433d3ff227384c0572f
ramesequence/jni/FrameSequence_gif.cpp
|
| 139ca621509e7e7d006cd3d80d9a31b3bacf5d02 |
18-Oct-2016 |
Chris Craik <ccraik@google.com> |
Merge "Fix a bug that the FSD should loop infinitely if the loop count from file or set by setLoopCount is 0 (or smaller)." am: 2c9a07cdd4 am: 523ba5e9a2
am: 221c1e1b2d
Change-Id: I4e815deac75259e60c89357cb8c24ccd5ba3f790
|
| 221c1e1b2dd838d1a65d893b7c6c3fbdadbed9f6 |
18-Oct-2016 |
Chris Craik <ccraik@google.com> |
Merge "Fix a bug that the FSD should loop infinitely if the loop count from file or set by setLoopCount is 0 (or smaller)." am: 2c9a07cdd4
am: 523ba5e9a2
Change-Id: I341cdf9533ed53a1f501d987bb51d0aaa2738981
|
| 523ba5e9a2a5d0c2d451bf4f5e33dc2c9c43b086 |
18-Oct-2016 |
Chris Craik <ccraik@google.com> |
Merge "Fix a bug that the FSD should loop infinitely if the loop count from file or set by setLoopCount is 0 (or smaller)."
am: 2c9a07cdd4
Change-Id: Id0ab488b6832f963dbd6e53f50e3553494c7cc2a
|
| 2c9a07cdd40f47c289331c36a297a03882e6cd54 |
18-Oct-2016 |
Treehugger Robot <treehugger-gerrit@google.com> |
Merge "Fix a bug that the FSD should loop infinitely if the loop count from file or set by setLoopCount is 0 (or smaller)."
|
| b23d7abde766b0575d6a2592ea828d2d8596ecd4 |
17-Oct-2016 |
Chris Craik <ccraik@google.com> |
Fix a bug that the FSD should loop infinitely if the loop count from file or set by setLoopCount is 0 (or smaller).
Change-Id: Ifbadf0459b9b3437509a3becb00cc6f475a42965
ramesequence/src/android/support/rastermill/FrameSequenceDrawable.java
|
| 20ae4a778e9358f23657091fd084343433d048bb |
14-Oct-2016 |
Charles Zhang <ZhangCharles518@gmail.com> |
Merge "fix a mistake in AndroidCameraCapabilities.buildWhiteBalances()." am: 659f8313d7 am: c11b14c6b4
am: a69e6dece2
Change-Id: I2a6b56516149b15127de644d76c14a4d162cecbb
|
| a69e6dece26df19f1d22cea5f1676528107c3c49 |
14-Oct-2016 |
Charles Zhang <ZhangCharles518@gmail.com> |
Merge "fix a mistake in AndroidCameraCapabilities.buildWhiteBalances()." am: 659f8313d7
am: c11b14c6b4
Change-Id: I52373fb86991bd2a891a513024fab940c58c6092
|
| c11b14c6b4283d6d4d4e39ec442ea7ce72c41c7c |
14-Oct-2016 |
Charles Zhang <ZhangCharles518@gmail.com> |
Merge "fix a mistake in AndroidCameraCapabilities.buildWhiteBalances()."
am: 659f8313d7
Change-Id: I4d28847b50f3062c50ee913bbcf7d4533fd301a3
|
| 659f8313d7c804c3f27ff034d5b1194304d61372 |
14-Oct-2016 |
Treehugger Robot <treehugger-gerrit@google.com> |
Merge "fix a mistake in AndroidCameraCapabilities.buildWhiteBalances()."
|
| 5f82a7e40f93cf9ae70ba1dacb61e907b8bdcc83 |
20-Jul-2015 |
Charles Zhang <ZhangCharles518@gmail.com> |
fix a mistake in AndroidCameraCapabilities.buildWhiteBalances().
1.fix a mistake in AndroidCameraCapabilities.buildWhiteBalances().
2.add White Balance Parameter setting in applySettingsToParameters().
Change-Id: Ic74493026ebfa09e27f7c3ea83fee300f751c5c1
amera2/portability/src/com/android/ex/camera2/portability/AndroidCameraAgentImpl.java
amera2/portability/src/com/android/ex/camera2/portability/AndroidCameraCapabilities.java
|
| 3308f56e9af5f38f4b03e8b7700d3e8bf400fb38 |
10-Oct-2016 |
Shuzhen Wang <shuzhenwang@google.com> |
camera2: Add onCaptureQueueEmpty callback
onCaptureQueueEmpty is called when the non-repeating request queue
becomes empty.
Test: testMultipleCapture in PerformanceTest.java
Bug: 29006447
Change-Id: Ic19debb27dd9580b58d1790af03dc55fa0ac5db9
amera2/public/src/com/android/ex/camera2/blocking/BlockingSessionCallback.java
|
| ac2be4eb69d17dae3099a40fbba0608eeaf123e6 |
24-Aug-2016 |
Guang Zhu <guangzhu@google.com> |
Avoid JUnit4 collision in android-support-test, mockito-target
Bug: 31072145
Test: make droid checkbuild
Change-Id: I0e89cdca16e6874a0c5578190c33f251db6d3984
amera2/portability/tests/Android.mk
amera2/utils/tests/Android.mk
|
| a2ce8b060da4f34c606283de77f863207db40b40 |
24-Aug-2016 |
Chris Craik <ccraik@google.com> |
Merge "Fix a bug that a FSD that finished all loops is not marked as stopped (isRunning returns true after it stops)." am: d3a8520df0 am: c0497985df am: 99c592e9ca
am: 4f2b94ab8a
Change-Id: I85a514a71bf61673ccda02fac6358667bb29b0b0
|
| 4f2b94ab8a5e614ba929cbbba1acc7e6b5467f94 |
24-Aug-2016 |
Chris Craik <ccraik@google.com> |
Merge "Fix a bug that a FSD that finished all loops is not marked as stopped (isRunning returns true after it stops)." am: d3a8520df0 am: c0497985df
am: 99c592e9ca
Change-Id: I78f3005b7722d1c92f55c69e9be9a2dcfc4682e6
|
| 99c592e9ca51f7422ab94b07e6e043b08d597971 |
24-Aug-2016 |
Chris Craik <ccraik@google.com> |
Merge "Fix a bug that a FSD that finished all loops is not marked as stopped (isRunning returns true after it stops)." am: d3a8520df0
am: c0497985df
Change-Id: I1d5a4c860f6089ff4b1776086505990f13dd375e
|
| c0497985df6578c34e14760c44dffc83a1296e8a |
24-Aug-2016 |
Chris Craik <ccraik@google.com> |
Merge "Fix a bug that a FSD that finished all loops is not marked as stopped (isRunning returns true after it stops)."
am: d3a8520df0
Change-Id: I7d1da0f2a83f69fd31a56e46a77db8bfecb2b865
|
| d3a8520df0f54e30a3d06f7250b3605629165c1b |
24-Aug-2016 |
Treehugger Robot <treehugger-gerrit@google.com> |
Merge "Fix a bug that a FSD that finished all loops is not marked as stopped (isRunning returns true after it stops)."
|
| 1527ca54acf175853ba6eb3b1e0a3a674789e209 |
23-Aug-2016 |
Chris Craik <ccraik@google.com> |
Fix a bug that a FSD that finished all loops is not marked as stopped (isRunning returns true after it stops).
bug:30142379
Also use the new constant in the loop check and make it safer.
Change-Id: Id36f813fcf717607ccee5be89588d688f48f58d9
ramesequence/src/android/support/rastermill/FrameSequenceDrawable.java
|
| 17f8385d46ee0ab10c360c82d99229f0b0bdc273 |
11-Aug-2016 |
Chris Craik <ccraik@google.com> |
Merge "Fix FrameSequenceDrawable scaling with circle mask" am: a59975d908 am: 93980c692a am: 4bfb1bb120
am: d524ece421
Change-Id: Ia420541827701e88a662e71bcc3f3571b0fef0d6
|
| d524ece4210b57c44e9194fddc0e45956c23b973 |
11-Aug-2016 |
Chris Craik <ccraik@google.com> |
Merge "Fix FrameSequenceDrawable scaling with circle mask" am: a59975d908 am: 93980c692a
am: 4bfb1bb120
Change-Id: Ia6f628e46057f0efd3b33b0d25ee726f0ba5ef36
|
| 4bfb1bb1207d6eff99f93bf324d2543fbabf14ee |
11-Aug-2016 |
Chris Craik <ccraik@google.com> |
Merge "Fix FrameSequenceDrawable scaling with circle mask" am: a59975d908
am: 93980c692a
Change-Id: Ie708dbd3fa6980a80ece5d02545048fa3b97e501
|
| 93980c692a5d08e83bec11fbcb3a9c99d2af1dd9 |
11-Aug-2016 |
Chris Craik <ccraik@google.com> |
Merge "Fix FrameSequenceDrawable scaling with circle mask"
am: a59975d908
Change-Id: I2fb27c365c4c09c33247d53bcef272bc7da4612f
|
| a59975d90897856bdbd324bdce5448732c0e12ff |
11-Aug-2016 |
Treehugger Robot <treehugger-gerrit@google.com> |
Merge "Fix FrameSequenceDrawable scaling with circle mask"
|
| 958761ceb97982b510d3059d31ba8c45700a1654 |
11-Aug-2016 |
Chris Craik <ccraik@google.com> |
Fix FrameSequenceDrawable scaling with circle mask
bug:30010837
Also adds circle mask to test case, and switches away from ImageView in
order to test non-intrinsic bounds case.
Change-Id: I0c984d81f578992b9169f7577785ff8a8bfce9b8
ramesequence/samples/FrameSequenceSamples/res/layout/basic_test_activity.xml
ramesequence/samples/FrameSequenceSamples/res/values/strings.xml
ramesequence/samples/FrameSequenceSamples/src/com/android/framesequence/samples/FrameSequenceTest.java
ramesequence/src/android/support/rastermill/FrameSequenceDrawable.java
|
| 75965a896b696128c7afea9196ab370be6fd7bf5 |
10-Aug-2016 |
Chris Craik <ccraik@google.com> |
Merge "Add the fourth loop behavior LOOP_FINITE to FrameSequenceDrawable." am: a72047d5cf am: 26b6f955b5 am: 9291aff00b
am: de9ab3c092
Change-Id: I86bd260fe3d5f0aafbd4ce17ad95cdd345490c3a
|
| de9ab3c0924332e01ee21474570850ff9209d4cd |
10-Aug-2016 |
Chris Craik <ccraik@google.com> |
Merge "Add the fourth loop behavior LOOP_FINITE to FrameSequenceDrawable." am: a72047d5cf am: 26b6f955b5
am: 9291aff00b
Change-Id: I0d100f522e743c910b159a1d05eff21cf3a285e6
|
| 9291aff00ba48f850fdb577eb10daabca0be983c |
10-Aug-2016 |
Chris Craik <ccraik@google.com> |
Merge "Add the fourth loop behavior LOOP_FINITE to FrameSequenceDrawable." am: a72047d5cf
am: 26b6f955b5
Change-Id: I58d4eee0309a591f98d790dffe5636be2f7fd790
|
| 26b6f955b59b61f3a8e421405159c1c8db862ece |
10-Aug-2016 |
Chris Craik <ccraik@google.com> |
Merge "Add the fourth loop behavior LOOP_FINITE to FrameSequenceDrawable."
am: a72047d5cf
Change-Id: Ieb46d6e0f8f69b69098711c5c5d38c65bfc4c6ff
|
| a72047d5cf80e2d9c69cedd71decfda132aea6dd |
10-Aug-2016 |
Chris Craik <ccraik@google.com> |
Merge "Add the fourth loop behavior LOOP_FINITE to FrameSequenceDrawable."
|
| 3a208a6c6340cc636ed22919973264675da5eab0 |
10-Aug-2016 |
Chris Craik <ccraik@google.com> |
Add the fourth loop behavior LOOP_FINITE to FrameSequenceDrawable.
Change-Id: I286d0957fdb0f18791b0187f6f07f4f3ebc5be51
ramesequence/src/android/support/rastermill/FrameSequenceDrawable.java
|
| a650cbea25ec9202a65049c2d0fae4ce5dd30e0d |
20-Jul-2016 |
Dan Willemsen <dwillemsen@google.com> |
Revert "Revert "Revert "Camera2: Use hidden APIs"""
This reverts commit 7705b0b80a3f432c59d1e1892ca3751e89508aed. These APIs
aren't hidden anymore.
amera2/public/Android.mk
|
| b73718999dc4203933f1db6a47c1c34fdaac3ef9 |
08-Jul-2016 |
Chih-hung Hsieh <chh@google.com> |
Merge \\\\"Fix misc-macro-parentheses warnings in frameworks/ex.\\\\" am: 1d2b859918 am: c7d5566759 am: 747cb32036
am: 7293d9f151
Change-Id: I372a3dec33b072d7b590b9a279c7ba1ea7f416e8
|
| 7293d9f151e329a37b25a1481a943ea4d1d7946f |
08-Jul-2016 |
Chih-Hung Hsieh <chh@google.com> |
Merge \\\"Fix misc-macro-parentheses warnings in frameworks/ex.\\\" am: 1d2b859918 am: c7d5566759
am: 747cb32036
Change-Id: I2d9106ed6a71d35c2921e529910ed18c3b0c61b0
|
| 747cb320365de6c19a1a7916b44e90b8e9e0456a |
08-Jul-2016 |
Chih-hung Hsieh <chh@google.com> |
Merge \\"Fix misc-macro-parentheses warnings in frameworks/ex.\\" am: 1d2b859918
am: c7d5566759
Change-Id: I3b4315850d69ebc51cc42634e56f1f004843f8d1
|
| c7d55667590ba178fd5fab746c61f94f029765de |
08-Jul-2016 |
Chih-Hung Hsieh <chh@google.com> |
Merge \"Fix misc-macro-parentheses warnings in frameworks/ex.\"
am: 1d2b859918
Change-Id: I7dfdcaa08dd5e5eaf4638a5ba80c8e9fdb676e76
|
| 1d2b8599187ce190cce80a24b925a51875057e9f |
08-Jul-2016 |
Chih-hung Hsieh <chh@google.com> |
Merge "Fix misc-macro-parentheses warnings in frameworks/ex."
|
| 47e010874962f9fe97b6e6712a80900bc2b46846 |
29-Jun-2016 |
Chih-Hung Hsieh <chh@google.com> |
Fix misc-macro-parentheses warnings in frameworks/ex.
Add parentheses around parameters beside operators.
Bug: 28705665
Test: build with clang-tidy
Change-Id: I4ccbd902758dedd2dc5bc5562d48a572ecfa2d09
ramesequence/jni/JNIHelpers.h
|
| 93d6b2cc50416dcf75d381b5f49f16d4e2e55b7d |
11-May-2016 |
Chris Craik <ccraik@google.com> |
Merge "Catch exceptions during decode and abort." am: 69c5e0b169 am: 0d6c2ead8f am: 5c68ea0f68
am: a7121cc5e1
* commit 'a7121cc5e129c1b245887077b5d60dd7867a929c':
Catch exceptions during decode and abort.
Change-Id: I535fe8a688c5b6caf77206468f33744159752c4e
|
| a7121cc5e129c1b245887077b5d60dd7867a929c |
11-May-2016 |
Chris Craik <ccraik@google.com> |
Merge "Catch exceptions during decode and abort." am: 69c5e0b169 am: 0d6c2ead8f
am: 5c68ea0f68
* commit '5c68ea0f682bb344b223c4818814712d5fd9075d':
Catch exceptions during decode and abort.
Change-Id: Ia7d9ab37aa5e56eaa9eaaa24a3dde17e5ba5ecc5
|
| 5c68ea0f682bb344b223c4818814712d5fd9075d |
11-May-2016 |
Chris Craik <ccraik@google.com> |
Merge "Catch exceptions during decode and abort." am: 69c5e0b169
am: 0d6c2ead8f
* commit '0d6c2ead8fc099706fa361133f881f9721ac2958':
Catch exceptions during decode and abort.
Change-Id: Ia5ace40d8c4805a1492006676ebb6be44ae617fa
|
| 0d6c2ead8fc099706fa361133f881f9721ac2958 |
11-May-2016 |
Chris Craik <ccraik@google.com> |
Merge "Catch exceptions during decode and abort."
am: 69c5e0b169
* commit '69c5e0b169de2a8cfe0b0db3a71a143756ebf65b':
Catch exceptions during decode and abort.
Change-Id: I3f80bd6c0d87fc2f99272c21eecbed4572f2cf9a
|
| 69c5e0b169de2a8cfe0b0db3a71a143756ebf65b |
11-May-2016 |
Treehugger Robot <treehugger-gerrit@google.com> |
Merge "Catch exceptions during decode and abort."
|
| 769d2c1df936a328f324a953f3cdf5901dd99078 |
09-May-2016 |
Chris Craik <ccraik@google.com> |
Catch exceptions during decode and abort.
bug:27561875
Change-Id: I461567316fcee2e425e040c8120dfc5f0c03fba9
ramesequence/jni/FrameSequenceJNI.cpp
ramesequence/src/android/support/rastermill/FrameSequenceDrawable.java
|
| 85d4a6f454da174dbf5b4b7e8e0074bf131c38dd |
10-May-2016 |
Chris Craik <ccraik@google.com> |
Merge "Fix initialization" am: e5b39f07cb am: ad2c2d3f34 am: d14219fa57
am: e762e3e4b3
* commit 'e762e3e4b30ac4805cef6b5fd8b42b464327c103':
Fix initialization
Change-Id: I129f8797a7fc979e2de72864dcaa73111c263c07
|
| e762e3e4b30ac4805cef6b5fd8b42b464327c103 |
10-May-2016 |
Chris Craik <ccraik@google.com> |
Merge "Fix initialization" am: e5b39f07cb am: ad2c2d3f34
am: d14219fa57
* commit 'd14219fa57cf4522c0968bce6e052231113bc688':
Fix initialization
Change-Id: Iae522cf0262d90ef87e5c9d1435f7e82e514e6b2
|
| d14219fa57cf4522c0968bce6e052231113bc688 |
10-May-2016 |
Chris Craik <ccraik@google.com> |
Merge "Fix initialization" am: e5b39f07cb
am: ad2c2d3f34
* commit 'ad2c2d3f34e5f240a82d30b55d5aba71495f5c11':
Fix initialization
Change-Id: I853bb59cf06af123d38ddcc836cb889285ae3d9a
|
| ad2c2d3f34e5f240a82d30b55d5aba71495f5c11 |
10-May-2016 |
Chris Craik <ccraik@google.com> |
Merge "Fix initialization"
am: e5b39f07cb
* commit 'e5b39f07cbbc78ffb8570e475642323d4a172b95':
Fix initialization
Change-Id: Ifc4b70b07e250303cbcbc2a50f2fe7255d7708c5
|
| e5b39f07cbbc78ffb8570e475642323d4a172b95 |
10-May-2016 |
Chris Craik <ccraik@google.com> |
Merge "Fix initialization"
|
| 72f6c7663a591b003b8e8d2429164bbc74d8b7d2 |
09-May-2016 |
Chris Craik <ccraik@google.com> |
Fix initialization
Change-Id: I17a82a4555d8b577e03c0ede41e55ba881fe3d02
ramesequence/jni/FrameSequence_webp.h
|
| cb45e1abd107c29cd3edfca8fc34d7bcaf006184 |
22-Apr-2016 |
Tobias Thierer <tobiast@google.com> |
Merge "frameworks/ex: Avoid Long allocation that is immediately unboxed." am: cf42f4e190 am: 782d7d5bab am: 37190aae47
am: fd69c5b809
* commit 'fd69c5b809984655ee8d268649ef6829c80ebbb8':
frameworks/ex: Avoid Long allocation that is immediately unboxed.
Change-Id: I9a7580e11335d073bc6335553f6118bf92f05736
|
| fd69c5b809984655ee8d268649ef6829c80ebbb8 |
22-Apr-2016 |
Tobias Thierer <tobiast@google.com> |
Merge "frameworks/ex: Avoid Long allocation that is immediately unboxed." am: cf42f4e190 am: 782d7d5bab
am: 37190aae47
* commit '37190aae4759079b111a00af9bb225dfbef9887d':
frameworks/ex: Avoid Long allocation that is immediately unboxed.
Change-Id: If6f47a54684cfb0128e6db35a7c1ea442af75d8d
|
| 37190aae4759079b111a00af9bb225dfbef9887d |
22-Apr-2016 |
Tobias Thierer <tobiast@google.com> |
Merge "frameworks/ex: Avoid Long allocation that is immediately unboxed." am: cf42f4e190
am: 782d7d5bab
* commit '782d7d5baba6f969480a5f5460456959e9b941b1':
frameworks/ex: Avoid Long allocation that is immediately unboxed.
Change-Id: I86c316b4b291d4231a1e9490da7d5dbcd023a15f
|
| 782d7d5baba6f969480a5f5460456959e9b941b1 |
22-Apr-2016 |
Tobias Thierer <tobiast@google.com> |
Merge "frameworks/ex: Avoid Long allocation that is immediately unboxed."
am: cf42f4e190
* commit 'cf42f4e19047121dae2a51eddbfbfea6fe7a6eb7':
frameworks/ex: Avoid Long allocation that is immediately unboxed.
Change-Id: Ib926cfd0729379a3e7725b8f369bc10545642541
|
| cf42f4e19047121dae2a51eddbfbfea6fe7a6eb7 |
22-Apr-2016 |
Tobias Thierer <tobiast@google.com> |
Merge "frameworks/ex: Avoid Long allocation that is immediately unboxed."
|
| 583c023b9529a1ec05ca670a85ff1320fdc6d4eb |
21-Apr-2016 |
Tobias Thierer <tobiast@google.com> |
frameworks/ex: Avoid Long allocation that is immediately unboxed.
Bug: 28289401
Change-Id: Ibe934ffd1f37740c24c9efc19f109285099205d8
ommon/java/com/android/common/OperationScheduler.java
|
| 29134bfe1712e58c31c68789247495e2efcc7fdb |
24-Mar-2016 |
Walter Jang <wjang@google.com> |
Fix StaleDataException in changeCursor
Check whether the cursor is closed before trying to getColumnIndex
Bug 26926075
Change-Id: Iffb0694b153f39d871d536dd60113c0853af7211
ommon/java/com/android/common/widget/CompositeCursorAdapter.java
|
| ef8ab805d2b114e9d0dd98ae067c056b4a09a377 |
20-Nov-2015 |
Siyamed Sinir <siyamed@google.com> |
Output shorter lines for TLD pattern
The output had line breaks at every alpha character and this caused
lines that were too long to be in the code. This CL, tries to produce
shorter lines by adding a new line if the current line is longer than
a hundred characters.
Change-Id: I87e8a1782ddc4f9369c0fd6018c499a2c0f75936
ommon/tools/make-iana-tld-pattern.py
|
| 2718f10addffed64f80979f3429f4546051c5681 |
27-Aug-2015 |
Derek Sollenberger <djsollen@google.com> |
am f7570b7c: am 76bfd10a: (-s ours) am 1bd8dec0: Merge "Fix breakage from giflib update"
* commit 'f7570b7cf996161ea10f66dbc0f4960e03c481f1':
|
| f7570b7cf996161ea10f66dbc0f4960e03c481f1 |
27-Aug-2015 |
Derek Sollenberger <djsollen@google.com> |
am 76bfd10a: (-s ours) am 1bd8dec0: Merge "Fix breakage from giflib update"
* commit '76bfd10a3e2fc5f027b5fb634f2447dfb962c9bb':
|
| 26219ff97598d7a414dfb5e878cf6d539f8ccc52 |
19-May-2015 |
Chris Wren <cwren@android.com> |
add a logtag for framework metrics
Bug: 21266304
Change-Id: I6cb8b05d2efc70d3269f06a9c882afbe2d16ebda
ommon/java/com/android/common/GoogleLogTags.logtags
|
| ebe84b1b8205f47f0ae134b51ef532fedfc6962f |
24-Aug-2015 |
Derek Sollenberger <djsollen@google.com> |
am 6448c467: am 1bd8dec0: Merge "Fix breakage from giflib update"
* commit '6448c46716316de42af17a49d9fbf2fd8865e033':
Fix breakage from giflib update
|
| 6448c46716316de42af17a49d9fbf2fd8865e033 |
24-Aug-2015 |
Derek Sollenberger <djsollen@google.com> |
am 1bd8dec0: Merge "Fix breakage from giflib update"
* commit '1bd8dec0b9cf4d77e33cd535eb1f2c76448b505b':
Fix breakage from giflib update
|
| 76bfd10a3e2fc5f027b5fb634f2447dfb962c9bb |
24-Aug-2015 |
Derek Sollenberger <djsollen@google.com> |
am 1bd8dec0: Merge "Fix breakage from giflib update"
* commit '1bd8dec0b9cf4d77e33cd535eb1f2c76448b505b':
Fix breakage from giflib update
|
| 1bd8dec0b9cf4d77e33cd535eb1f2c76448b505b |
24-Aug-2015 |
Derek Sollenberger <djsollen@google.com> |
Merge "Fix breakage from giflib update"
|
| 164b6937223c9f9cbb84b213740e3e80f940b193 |
24-Aug-2015 |
Matt Sarett <msarett@google.com> |
Fix breakage from giflib update
Change-Id: Id758778cd9960292be038aa691f2420fbac1378c
ramesequence/jni/FrameSequence_gif.cpp
|
| 2ed732d1828e97d752d43677ba6dc18f079691c2 |
09-Jun-2015 |
Yin-Chia Yeh <yinchiayeh@google.com> |
am 4f54368f: am 8d069cf9: Merge "Camera2: Support waitForSurfacePrepared in BlockingSessionCallback" into mnc-dev
* commit '4f54368fdbfb5f868070091a891c98303e9b114e':
Camera2: Support waitForSurfacePrepared in BlockingSessionCallback
|
| 4f54368fdbfb5f868070091a891c98303e9b114e |
09-Jun-2015 |
Yin-Chia Yeh <yinchiayeh@google.com> |
am 8d069cf9: Merge "Camera2: Support waitForSurfacePrepared in BlockingSessionCallback" into mnc-dev
* commit '8d069cf9807027f7b3148589292f8f0544179ebf':
Camera2: Support waitForSurfacePrepared in BlockingSessionCallback
|
| 8d069cf9807027f7b3148589292f8f0544179ebf |
09-Jun-2015 |
Yin-Chia Yeh <yinchiayeh@google.com> |
Merge "Camera2: Support waitForSurfacePrepared in BlockingSessionCallback" into mnc-dev
|
| 39c31d49ce38158b7708581df0813b03e32d6eea |
06-Jun-2015 |
Yin-Chia Yeh <yinchiayeh@google.com> |
Camera2: Support waitForSurfacePrepared in BlockingSessionCallback
Change-Id: I7f6f351092a173fe0b7a567e5240cb5abe8cb2de
amera2/public/src/com/android/ex/camera2/blocking/BlockingSessionCallback.java
|
| 8819cca4ba654fd24746930b4c3a29ae6ed0c8f9 |
02-Jun-2015 |
Andrew Lee <anwlee@google.com> |
am 037f27e3: resolved conflicts for merge of 9c9958ca to mnc-dev-plus-aosp
* commit '037f27e3b88830fdef6871c7d3a0121915b12e56':
Remove variable-speed library.
|
| 037f27e3b88830fdef6871c7d3a0121915b12e56 |
02-Jun-2015 |
Andrew Lee <anwlee@google.com> |
resolved conflicts for merge of 9c9958ca to mnc-dev-plus-aosp
Change-Id: Id3203fa190b351074a56195b8dfea4f6cee9a767
|
| 9c9958ca6c51676cab549d19311df59a1b4ccf1a |
01-Jun-2015 |
Andrew Lee <anwlee@google.com> |
Remove variable-speed library.
Bug: 21444991
Change-Id: I3e1fc7f0773ddfa227cde6b5161102a087f47702
ariablespeed/Android.mk
ariablespeed/jni/Android.mk
ariablespeed/jni/decode_buffer.cc
ariablespeed/jni/decode_buffer.h
ariablespeed/jni/hlogging.h
ariablespeed/jni/integral_types.h
ariablespeed/jni/jni_entry.cc
ariablespeed/jni/macros.h
ariablespeed/jni/no_synchronization.h
ariablespeed/jni/profile_timer.h
ariablespeed/jni/ring_buffer.cc
ariablespeed/jni/ring_buffer.h
ariablespeed/jni/sola_time_scaler.cc
ariablespeed/jni/sola_time_scaler.h
ariablespeed/jni/variablespeed.cc
ariablespeed/jni/variablespeed.h
ariablespeed/src/com/android/ex/variablespeed/EngineParameters.java
ariablespeed/src/com/android/ex/variablespeed/MediaPlayerDataSource.java
ariablespeed/src/com/android/ex/variablespeed/MediaPlayerProxy.java
ariablespeed/src/com/android/ex/variablespeed/SingleThreadedMediaPlayerProxy.java
ariablespeed/src/com/android/ex/variablespeed/VariableSpeed.java
ariablespeed/src/com/android/ex/variablespeed/VariableSpeedNative.java
ariablespeed/tests/Android.mk
ariablespeed/tests/AndroidManifest.xml
ariablespeed/tests/assets/README.txt
ariablespeed/tests/assets/count_and_test.3gpp
ariablespeed/tests/assets/fake_voicemail.mp3
ariablespeed/tests/assets/fake_voicemail2.mp3
ariablespeed/tests/assets/quick_test_recording.mp3
ariablespeed/tests/src/com/android/ex/variablespeed/AwaitableCompletionListener.java
ariablespeed/tests/src/com/android/ex/variablespeed/AwaitableErrorListener.java
ariablespeed/tests/src/com/android/ex/variablespeed/DynamicProxy.java
ariablespeed/tests/src/com/android/ex/variablespeed/MediaPlayerProxyTestCase.java
ariablespeed/tests/src/com/android/ex/variablespeed/RealMediaPlayerTest.java
ariablespeed/tests/src/com/android/ex/variablespeed/VariableSpeedTest.java
|
| cbdbe41bd312cd6956d14725c8e2b18e19b88c7d |
30-May-2015 |
Chris Craik <ccraik@google.com> |
am c8c2dec0: am 51527497: Merge "Add setCircularMaskEnabled"
* commit 'c8c2dec0708bad491f736560d9ef6b8d5aa6ff32':
Add setCircularMaskEnabled
|
| c8c2dec0708bad491f736560d9ef6b8d5aa6ff32 |
30-May-2015 |
Chris Craik <ccraik@google.com> |
am 51527497: Merge "Add setCircularMaskEnabled"
* commit '515274973fb4eff42770daa92c272234c0415cdd':
Add setCircularMaskEnabled
|
| 515274973fb4eff42770daa92c272234c0415cdd |
29-May-2015 |
Chris Craik <ccraik@google.com> |
Merge "Add setCircularMaskEnabled"
|
| 537754df0d7348949e2324a91cc9e4df7571d7bf |
29-May-2015 |
Chris Craik <ccraik@google.com> |
Add setCircularMaskEnabled
Also fixes a bug where unscheduling the drawable doesn't reset the
state, potentially leading to situations where it has been unscheduled
but its state is still SCHEDULED
Change-Id: Iec872eda5ccc5c60fb8215c406cad430513168e4
ramesequence/src/android/support/rastermill/FrameSequenceDrawable.java
|
| 4c45af2dceab9fa3de3bdd45d5f52c251c25c861 |
22-May-2015 |
Paul Duffin <paulduffin@google.com> |
am 7492d060: am 47acc4b4: Merge "Use try-with-resources instead of Closeables.closeQuietly(Closeable)"
* commit '7492d0606ddfb1aaf483b445161dcb329430597c':
Use try-with-resources instead of Closeables.closeQuietly(Closeable)
|
| 3a2703565e39fb924e8b4b54b126cf135859bfa6 |
22-May-2015 |
Paul Duffin <paulduffin@google.com> |
am 56f9fe09: am b8ba8dbc: Merge "Include the frameworks/ex/variablespeed/tests/Android.mk file"
* commit '56f9fe09254082b67cc40e38555f3bbd66a893bb':
Include the frameworks/ex/variablespeed/tests/Android.mk file
|
| 7492d0606ddfb1aaf483b445161dcb329430597c |
22-May-2015 |
Paul Duffin <paulduffin@google.com> |
am 47acc4b4: Merge "Use try-with-resources instead of Closeables.closeQuietly(Closeable)"
* commit '47acc4b4f4f7f15641044126a48028fbb0018350':
Use try-with-resources instead of Closeables.closeQuietly(Closeable)
|
| 56f9fe09254082b67cc40e38555f3bbd66a893bb |
22-May-2015 |
Paul Duffin <paulduffin@google.com> |
am b8ba8dbc: Merge "Include the frameworks/ex/variablespeed/tests/Android.mk file"
* commit 'b8ba8dbc906eda2d5ae35846d50bc9414a6ac7d6':
Include the frameworks/ex/variablespeed/tests/Android.mk file
|
| 47acc4b4f4f7f15641044126a48028fbb0018350 |
22-May-2015 |
Paul Duffin <paulduffin@google.com> |
Merge "Use try-with-resources instead of Closeables.closeQuietly(Closeable)"
|
| b8ba8dbc906eda2d5ae35846d50bc9414a6ac7d6 |
22-May-2015 |
Paul Duffin <paulduffin@google.com> |
Merge "Include the frameworks/ex/variablespeed/tests/Android.mk file"
|
| a4b5f739f5203d4f8c327a2670e427510e5867ef |
22-May-2015 |
Paul Duffin <paulduffin@google.com> |
Use try-with-resources instead of Closeables.closeQuietly(Closeable)
Closeables.closeQuietly(Closeable) has been deprecated for a
long time and removed in version 17. It was temporarily patched
back in to allow upgrading from version 14 but it will be
removed completely once we upgrade to version 18 so any usages
need to be updated.
Change-Id: Ifae0124975ed20f2549e743ee6fad155e39c89b4
ariablespeed/tests/src/com/android/ex/variablespeed/MediaPlayerProxyTestCase.java
|
| f5d1aa126d3f5fbfd46a130305e77cc649a72c25 |
21-May-2015 |
Paul Duffin <paulduffin@google.com> |
Include the frameworks/ex/variablespeed/tests/Android.mk file
The makefile was not included, either from the AOSP root makefile
or from the makefile at the root of this tree. This change fixes
that.
Change-Id: I1acf663ca19a459e6c67f2d8354f9b5310f54ec0
ariablespeed/Android.mk
|
| c0b3917d2fe361b42e457b775055cd27e907726c |
15-May-2015 |
Chris Craik <ccraik@google.com> |
am 49640ea5: am 55882370: Merge "Move min framerate behavior to Java"
* commit '49640ea5d631a3acc67b248889e7a7da187d4a07':
Move min framerate behavior to Java
|
| 49640ea5d631a3acc67b248889e7a7da187d4a07 |
15-May-2015 |
Chris Craik <ccraik@google.com> |
am 55882370: Merge "Move min framerate behavior to Java"
* commit '55882370101a14df8d1c269e84b10a658cd72fca':
Move min framerate behavior to Java
|
| 55882370101a14df8d1c269e84b10a658cd72fca |
15-May-2015 |
Chris Craik <ccraik@google.com> |
Merge "Move min framerate behavior to Java"
|
| e532fb97ba883a488bb751d51732274e03a052af |
15-May-2015 |
Chris Craik <ccraik@google.com> |
Move min framerate behavior to Java
bug:21000334
Change-Id: I3ffae0e4e6b69755c190e1746d80fa2f623289fa
ramesequence/jni/FrameSequence_gif.cpp
ramesequence/src/android/support/rastermill/FrameSequenceDrawable.java
|
| 77142b8ec88219bfc3d45193501e4d04dc6b179e |
14-May-2015 |
Eino-Ville Talvala <etalvala@google.com> |
am ebb6c511: Camera2: Support onSurfacePrepared in BlockingSessionCallback
* commit 'ebb6c5111f287a8cf55f1dcac7d7c5b76d9260ff':
Camera2: Support onSurfacePrepared in BlockingSessionCallback
|
| ebb6c5111f287a8cf55f1dcac7d7c5b76d9260ff |
13-May-2015 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Support onSurfacePrepared in BlockingSessionCallback
Change-Id: Id46c044badb98f7837ca3898758997c171aa5c68
amera2/public/src/com/android/ex/camera2/blocking/BlockingSessionCallback.java
|
| ad9bf1e0db6b93ec40fa0f05bcbe1579b2c75a92 |
29-Apr-2015 |
Jiawen Chen <jiawen@google.com> |
am 046ba28a: (-s ours) DO NOT MERGE: Minor style fixes.
* commit '046ba28a082f30d56a1ac63eaa13b5cf95093db6':
DO NOT MERGE: Minor style fixes.
|
| 046ba28a082f30d56a1ac63eaa13b5cf95093db6 |
17-Apr-2015 |
Jiawen Chen <jiawen@google.com> |
DO NOT MERGE: Minor style fixes.
- BlockingCameraManager had the wrong TAG.
- Added static / final to NUM_STATES.
- Javadoc @param mismatch.
Change-Id: I0dbe6b3d4bdcb5a51ba0aea89985c3495a59381e
(cherry picked from commit 5a772174d14175474e76701b07cc0be86c3df32a)
amera2/public/src/com/android/ex/camera2/blocking/BlockingCameraManager.java
amera2/public/src/com/android/ex/camera2/blocking/BlockingSessionCallback.java
amera2/public/src/com/android/ex/camera2/blocking/BlockingStateCallback.java
amera2/public/src/com/android/ex/camera2/utils/StateChangeListener.java
amera2/public/src/com/android/ex/camera2/utils/StateWaiter.java
|
| 624ce7b5f73a89ccb7890aaee3f929bbd1fea6fa |
29-Apr-2015 |
Jiawen Chen <jiawen@google.com> |
Merge "Minor style fixes."
|
| 5a772174d14175474e76701b07cc0be86c3df32a |
17-Apr-2015 |
Jiawen Chen <jiawen@google.com> |
Minor style fixes.
- BlockingCameraManager had the wrong TAG.
- Added static / final to NUM_STATES.
- Javadoc @param mismatch.
Change-Id: I0dbe6b3d4bdcb5a51ba0aea89985c3495a59381e
amera2/public/src/com/android/ex/camera2/blocking/BlockingCameraManager.java
amera2/public/src/com/android/ex/camera2/blocking/BlockingSessionCallback.java
amera2/public/src/com/android/ex/camera2/blocking/BlockingStateCallback.java
amera2/public/src/com/android/ex/camera2/utils/StateChangeListener.java
amera2/public/src/com/android/ex/camera2/utils/StateWaiter.java
|
| b96c229bdb5f4eab9f2f9e593e72f28626c7d4e3 |
24-Apr-2015 |
Chris Craik <ccraik@google.com> |
am 20df46ed: am 3ed91a81: Merge "Fix race in bitmap decode vs release."
* commit '20df46edeb2ddac7be4a4587e2ce210a735a1871':
Fix race in bitmap decode vs release.
|
| 20df46edeb2ddac7be4a4587e2ce210a735a1871 |
24-Apr-2015 |
Chris Craik <ccraik@google.com> |
am 3ed91a81: Merge "Fix race in bitmap decode vs release."
* commit '3ed91a812dc34b1a8a594322aaff5d9df0467d3f':
Fix race in bitmap decode vs release.
|
| 3ed91a812dc34b1a8a594322aaff5d9df0467d3f |
24-Apr-2015 |
Chris Craik <ccraik@google.com> |
Merge "Fix race in bitmap decode vs release."
|
| 38f3678fe9ee5e050af1587a525dadc40f526a51 |
23-Apr-2015 |
Chris Craik <ccraik@google.com> |
Fix race in bitmap decode vs release.
Now, if the decode is still running at destroy time, have
the decode runnable/thread manage the cleanup.
Change-Id: Ifcebf9f00417275229087d6c36989519d5f73aed
ramesequence/src/android/support/rastermill/FrameSequenceDrawable.java
|
| 33d22e9689027fbcc8b9cd5c7db5787853ba546d |
20-Apr-2015 |
Chris Craik <ccraik@android.com> |
am 47098ae3: am 33817eae: Merge "Simplify destruction path - require users to call destroy()"
* commit '47098ae3d7bcf54e180b381327fdc0f3175b286a':
Simplify destruction path - require users to call destroy()
|
| 47098ae3d7bcf54e180b381327fdc0f3175b286a |
20-Apr-2015 |
Chris Craik <ccraik@android.com> |
am 33817eae: Merge "Simplify destruction path - require users to call destroy()"
* commit '33817eaefa27af45f0e25358ff36a09a4843aab8':
Simplify destruction path - require users to call destroy()
|
| 33817eaefa27af45f0e25358ff36a09a4843aab8 |
20-Apr-2015 |
Chris Craik <ccraik@android.com> |
Merge "Simplify destruction path - require users to call destroy()"
|
| c9c41794b77da22576e42fb85336a034a1d570ec |
03-Apr-2015 |
Jay Shrauner <shrauner@google.com> |
Merge "Fix StaleDataException in isPartitionEmpty"
|
| 3b108af8b10f11a6186c130dcd1ab647369b1985 |
03-Apr-2015 |
Chris Craik <ccraik@android.com> |
am 315c8a38: am d90222ba: Merge "Adding Bytebuffer support to rastermill library"
* commit '315c8a384c4ca2a5670b9eed407caa5dea6c1ce0':
Adding Bytebuffer support to rastermill library
|
| 315c8a384c4ca2a5670b9eed407caa5dea6c1ce0 |
03-Apr-2015 |
Chris Craik <ccraik@android.com> |
am d90222ba: Merge "Adding Bytebuffer support to rastermill library"
* commit 'd90222baefb107ddc08d024b02d664d18f50f44f':
Adding Bytebuffer support to rastermill library
|
| d90222baefb107ddc08d024b02d664d18f50f44f |
03-Apr-2015 |
Chris Craik <ccraik@android.com> |
Merge "Adding Bytebuffer support to rastermill library"
|
| 62e75fbd7d174d511e35a19a882a249490daa2cd |
02-Apr-2015 |
Jay Shrauner <shrauner@google.com> |
Fix StaleDataException in isPartitionEmpty
Check whether the cursor is closed before querying getCount()
Bug:20052582
Change-Id: I4f205cba25428a95d8416d7f7bcedbda40d622c4
ommon/java/com/android/common/widget/CompositeCursorAdapter.java
|
| 6a61141137c7a46d747aa611c9caf62436bc119f |
01-Apr-2015 |
Chris Craik <ccraik@google.com> |
Adding Bytebuffer support to rastermill library
Change-Id: Ifedaeaec49caffa5add357246ff43e2b870949f0
ramesequence/Android.mk
ramesequence/jni/FrameSequence.h
ramesequence/jni/FrameSequenceJNI.cpp
ramesequence/jni/FrameSequence_gif.cpp
ramesequence/jni/FrameSequence_gif.h
ramesequence/jni/FrameSequence_webp.cpp
ramesequence/jni/FrameSequence_webp.h
ramesequence/jni/Registry.cpp
ramesequence/jni/Registry.h
ramesequence/jni/Stream.cpp
ramesequence/jni/Stream.h
ramesequence/src/android/support/rastermill/FrameSequence.java
|
| d9e79df27877ea2b7bf55044f4bde687f28a6ac5 |
23-Mar-2015 |
Qiwen Zhao <zhao@google.com> |
am 25a2979c: (-s ours) reset to lmp-mr1-dev-plus-aosp with history. DO NOT MERGE ANYWHERE.
* commit '25a2979c374bda4f4aa26b26bc72a28fa55f38cf':
|
| 25a2979c374bda4f4aa26b26bc72a28fa55f38cf |
21-Mar-2015 |
Qiwen Zhao <zhao@google.com> |
reset to lmp-mr1-dev-plus-aosp with history. DO NOT MERGE ANYWHERE.
|
| d419fb9326a77155326ffa4e009c48ff33c5f2f4 |
20-Mar-2015 |
Eino-Ville Talvala <etalvala@google.com> |
am 9d283076: am 06b23bb5: Merge "Camera2: Update for camera2 API changes" into lmp-dev
* commit '9d283076744f1d8f5166476b747f23c3bc443aba':
|
| c0cf6e7c4c0bcaf9c42ba5061541463b4051fe4e |
20-Mar-2015 |
Rachad Alao <rachad@google.com> |
am 2ad38174: am 9f57c438: Merge "portability: Fix a bug where long AF callbacks caused ISE timeouts" into lmp-dev
* commit '2ad38174f2adfd09bc9b28087820079575877645':
|
| 4816bd42f4b899f0145428244669f076ca53a2ea |
20-Mar-2015 |
Senpo Hu <senpo@google.com> |
am e46a8378: am 25ee73ac: Let CameraProxy support setJpegOrientation.
* commit 'e46a8378bc9d05ea41eca153f98b00e43ff9f70b':
|
| eded6a15e4167605988b7278e19879a7bf6abad4 |
20-Mar-2015 |
Alan Newberger <alann@google.com> |
am 6c2fa7f2: am ca507f86: Merge "Log null returns from Camera.getParameters" into lmp-dev
* commit '6c2fa7f20c7dc4f2d425f07b39cb574291c3ed15':
|
| b4640a61e52f93e63008dfb13b871ff860f2ec75 |
20-Mar-2015 |
Igor Murashkin <iam@google.com> |
am 46637f4b: am d5205c26: Merge "portability: Fix incorrect comparison between int and Integer" into lmp-dev
* commit '46637f4b11090250fb16ce27e50b012351c750e6':
|
| 63d1d846a7d6b68368a58d5771dff74301f19608 |
20-Mar-2015 |
Eino-Ville Talvala <etalvala@google.com> |
am 3d63c611: am bb013aa3: Camera2: Renames for API consistency
* commit '3d63c61135a25a725dba50180c21254eb436e3b2':
|
| e110a5bf495cb80d2fab1c2fad67b9adef9fea5b |
20-Mar-2015 |
Ruben Brunk <rubenbrunk@google.com> |
am 320ae7b7: am 3b7da912: ex: Avoid exception if HDR_SCENE_MODE name changes.
* commit '320ae7b7410342eedb7b689bb5a84323f3c125d8':
|
| c76e4c5b4a2838879da5cb2d22ec1edece434874 |
20-Mar-2015 |
Ruben Brunk <rubenbrunk@google.com> |
am 0497ec6e: am 9fb7e160: Merge "camera2: Add HDR vendor tag for legacy mode." into lmp-dev
* commit '0497ec6e0b24e5153dda7dcd7ff82cfabfcfdf18':
|
| 1eeb46e12fa50393b55aa4dbf20b092a3a9381ef |
20-Mar-2015 |
Igor Murashkin <iam@google.com> |
am df8bf90c: am 58774cf3: Merge "camera2-portability: Touch-to-focus accounting for effective crop" into lmp-dev
* commit 'df8bf90c8b1753a9e233f7694881c4c5bb172812':
|
| f9a31d3b203e916d785bb0cdb02db6365200f82f |
20-Mar-2015 |
Andy Huibers <andyhuibers@google.com> |
am 5537c7c1: am f73c6cf2: Add ability to reset focus and metering regions using API1.
* commit '5537c7c145c8be2289772910eb4a60b43de8c30f':
|
| 7fc4792202d5f279c05fde3f112f4d5245da241b |
20-Mar-2015 |
Sol Boucher <solb@google.com> |
am 25c45cca: am 415cf3ee: camera2-portability: Allow disabling the shutter sound on API 2
* commit '25c45cca5f0ee247554d26a3376096ed5c8ec010':
|
| 6e5595c17b70c7691335fde6a4b6ec09dcdf6d33 |
20-Mar-2015 |
Sol Boucher <solb@google.com> |
am d500784b: am 47a01cf0: Merge "camera2-portability: Fix and document obscure state machine bug" into lmp-dev
* commit 'd500784b9bdca48d19604bb4cebe84ea08c88a90':
|
| 5c140a976eabff02a85b38494b2fc2b4f5f194ac |
20-Mar-2015 |
Sol Boucher <solb@google.com> |
am 3a89cdf5: am 7d717032: camera2-portability: Fix camera2 takePicture AE regression
* commit '3a89cdf55cdef9426b0679f4d9e706da3715b2b9':
|
| 1e31441831e70ccd129f27327b89016e9c53f48f |
20-Mar-2015 |
Sol Boucher <solb@google.com> |
am ec891dde: am 7c8d6957: Merge "camera2-portability: Fix zoom occasionally not working" into lmp-dev
* commit 'ec891dde6a5de29ed505692b653f3ba3b3cae81f':
|
| 785c411c17592ff77a01de7707198c2a126bf9c4 |
20-Mar-2015 |
Sol Boucher <solb@google.com> |
am 444909d9: am 984a0864: camera2-portability: Optimize out some camera2 AE precaptures
* commit '444909d9aff00d322b5a596e576175bcf1550504':
|
| 8ad358493bad94cfe3207fb955c2f6a3a7630644 |
20-Mar-2015 |
Sol Boucher <solb@google.com> |
am c192e279: am f27e71f9: Merge "camera2-portability: Switch to ratio-based zoom interfaces" into lmp-dev
* commit 'c192e279acae7ce5b75e26c443bd53c33e9c667c':
|
| 4d6c20d943798711a94ef6c3afd025120fabdf7f |
20-Mar-2015 |
Sol Boucher <solb@google.com> |
am bfed64d0: am 336f88ed: Merge "camera2-api: Tag camera2 JPEGs with any provided location" into lmp-dev
* commit 'bfed64d0dc0020ab53ec734ea2547ea71ce0178f':
|
| fac872805bb2279a6f0714657caa554539ae820d |
20-Mar-2015 |
Sol Boucher <solb@google.com> |
am d90959c9: am d6a52ce7: Merge "camera2-api: Work around invalid camera2 API focus modes" into lmp-dev
* commit 'd90959c9fcf4ec6d6f332ab534993913538bfe38':
|
| 4f033908bd76e57ebb53c398ee56949db60a03f0 |
20-Mar-2015 |
Stephen Hines <srhines@google.com> |
am 18aa7840: resolved conflicts for merge of 1870c071 to lmp-dev-plus-aosp
* commit '18aa7840e17473544a80205367435e9c2e8b7527':
Remove deprecated carousel from frameworks/ex.
|
| 2ae49ab73f4ace163b9b6aa9e59e15cc5cc4cfd5 |
24-Feb-2015 |
Chris Craik <ccraik@android.com> |
am 46ca918d: am 482fc563: Merge "Make WebP in FrameSequence optional"
* commit '46ca918db82c1fca3f370ec6a9b936bf7268aa85':
Make WebP in FrameSequence optional
|
| 46ca918db82c1fca3f370ec6a9b936bf7268aa85 |
24-Feb-2015 |
Chris Craik <ccraik@android.com> |
am 482fc563: Merge "Make WebP in FrameSequence optional"
* commit '482fc563fa9783cce1dee882e8d4cd4d2d92b1c6':
Make WebP in FrameSequence optional
|
| 482fc563fa9783cce1dee882e8d4cd4d2d92b1c6 |
24-Feb-2015 |
Chris Craik <ccraik@android.com> |
Merge "Make WebP in FrameSequence optional"
|
| 1dcd11c8d1b433446147c8f1bddfa277c26c918e |
24-Feb-2015 |
Chris Craik <ccraik@google.com> |
Make WebP in FrameSequence optional
Pass FRAMESEQUENCE_INCLUDE_WEBP=true to enable
Change-Id: Ide605b3aca80c10a805d8983b2f06bcc983bf95a
ramesequence/jni/Android.mk
ramesequence/samples/FrameSequenceSamples/Android.mk
ramesequence/samples/FrameSequenceSamples/AndroidManifest.xml
ramesequence/samples/FrameSequenceSamples/build.xml
ramesequence/samples/FrameSequenceSamples/proguard.flags
ramesequence/samples/FrameSequenceSamples/project.properties
ramesequence/samples/FrameSequenceSamples/res/drawable-hdpi/ic_launcher.png
ramesequence/samples/FrameSequenceSamples/res/drawable-mdpi/ic_launcher.png
ramesequence/samples/FrameSequenceSamples/res/drawable-xhdpi/ic_launcher.png
ramesequence/samples/FrameSequenceSamples/res/layout/basic_test_activity.xml
ramesequence/samples/FrameSequenceSamples/res/raw/animated_gif.gif
ramesequence/samples/FrameSequenceSamples/res/raw/animated_webp.webp
ramesequence/samples/FrameSequenceSamples/res/values/strings.xml
ramesequence/samples/FrameSequenceSamples/res/values/styles.xml
ramesequence/samples/FrameSequenceSamples/src/com/android/framesequence/samples/FrameSequenceTest.java
ramesequence/samples/FrameSequenceSamples/src/com/android/framesequence/samples/SamplesList.java
ramesequence/samples/RastermillSamples/Android.mk
ramesequence/samples/RastermillSamples/AndroidManifest.xml
ramesequence/samples/RastermillSamples/build.xml
ramesequence/samples/RastermillSamples/proguard.flags
ramesequence/samples/RastermillSamples/project.properties
ramesequence/samples/RastermillSamples/res/drawable-hdpi/ic_launcher.png
ramesequence/samples/RastermillSamples/res/drawable-mdpi/ic_launcher.png
ramesequence/samples/RastermillSamples/res/drawable-xhdpi/ic_launcher.png
ramesequence/samples/RastermillSamples/res/layout/basic_test_activity.xml
ramesequence/samples/RastermillSamples/res/raw/animated.gif
ramesequence/samples/RastermillSamples/res/values/strings.xml
ramesequence/samples/RastermillSamples/res/values/styles.xml
ramesequence/samples/RastermillSamples/src/com/android/rastermill/samples/AnimatedGifTest.java
ramesequence/samples/RastermillSamples/src/com/android/rastermill/samples/SamplesList.java
ramesequence/src/android/support/rastermill/FrameSequenceDrawable.java
|
| b19ecfd9cfa2c417034403adf7039edf9fe59327 |
30-Jan-2015 |
Chris Craik <ccraik@google.com> |
Simplify destruction path - require users to call destroy()
bug:19035637
Change-Id: I1efbd8682977dd58c8c454b8253bfa82f6534ff5
ramesequence/src/android/support/rastermill/FrameSequenceDrawable.java
|
| c5effbd8ffed05f6c5142c1c8d491c398194bf5b |
05-Dec-2014 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Portability: Remove HDR hack.
Bug: 18640480
Change-Id: I8f0b42cbb05c6881fbc32664ce9e2b97a0ef5db3
leanSpec.mk
amera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2Capabilities.java
amera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2Settings.java
amera2/portability/src/com/android/ex/camera2/portability/LegacyVendorTags.java
|
| d6e77bd2255ee1b48d3e45ead10a8b2b5d975fc5 |
05-Jan-2015 |
Jay Shrauner <shrauner@google.com> |
am f924719d: am 7158b670: Fix StaleDataExceptions
* commit 'f924719d491c2b1a1c42234a0a174d975691b483':
Fix StaleDataExceptions
|
| f924719d491c2b1a1c42234a0a174d975691b483 |
05-Jan-2015 |
Jay Shrauner <shrauner@google.com> |
am 7158b670: Fix StaleDataExceptions
* commit '7158b6705d330ac1e61d5aa51c51b54507c4ab88':
Fix StaleDataExceptions
|
| 7158b6705d330ac1e61d5aa51c51b54507c4ab88 |
17-Dec-2014 |
Jay Shrauner <shrauner@google.com> |
Fix StaleDataExceptions
In ensureCacheValid, check whether the cursor is closed before
querying its count. In getItem, check whether the cursor is closed
before moving it to position, as was already being done in getItemId.
Bug:18815354
Change-Id: I4cf2509923695afe9499d0507383c4e0d51bd23e
ommon/java/com/android/common/widget/CompositeCursorAdapter.java
|
| 8e0e73eb302086ef0eab60226d35dd18e5f1d250 |
15-Dec-2014 |
Narayan Kamath <narayan@google.com> |
am b39a8a0b: am 6765631b: Merge "Remove apache dependency from android-common."
* commit 'b39a8a0b13bd48abb77439f62454c2f737b95f45':
Remove apache dependency from android-common.
|
| b39a8a0b13bd48abb77439f62454c2f737b95f45 |
15-Dec-2014 |
Narayan Kamath <narayan@google.com> |
am 6765631b: Merge "Remove apache dependency from android-common."
* commit '6765631b2eac9978b7ca2b7f8ef0dd6b53808d10':
Remove apache dependency from android-common.
|
| 6765631b2eac9978b7ca2b7f8ef0dd6b53808d10 |
15-Dec-2014 |
Narayan Kamath <narayan@google.com> |
Merge "Remove apache dependency from android-common."
|
| 81d4875bd9a69efb1aa59ce0dab2ce5449c3448e |
15-Dec-2014 |
Narayan Kamath <narayan@google.com> |
Remove apache dependency from android-common.
This static library was relying on HttpDateTime via AndroidHttpClient.
(and is the only user of this API in our tree). Regrettably, the most
reasonable way forward seems to be copy that class into frameworks/ex.
Using reflection is possible too, but it's riskier since we have to
ensure this class exists unmodified all the way back to froyo.
See API council request b/2553589 for why this was in AndroidHttpClient
in the first place.
Also, this change sets LOCAL_SDK_VERSION := 8 for tests to match the
library version.
bug: 18027885
Change-Id: I9c473f60f0314758120e0d6c6f9b56e4d77ba658
ommon/java/com/android/common/LegacyHttpDateTime.java
ommon/java/com/android/common/OperationScheduler.java
ommon/tests/Android.mk
|
| aa9ed1d0bfa5ed2929cefc875a14b327875db290 |
19-Nov-2014 |
Nick Korostelev <nkorsote@google.com> |
Cleaned up usages of deprecated API
Change-Id: Ie2f5fdc51d47e1d70dcfaf27550412d8569c1c04
amera2/portability/tests/src/com/android/ex/camera2/portability/Camera2PortabilityTest.java
amera2/utils/tests/src/com/android/ex/camera2/utils/Camera2DeviceTester.java
|
| a4b62c9ded07f30b0f68d3681b3058ee063eb8f2 |
16-Nov-2014 |
Dan Albert <danalbert@google.com> |
am 036ffbce: am 842e82f6: Merge "Move libvariablespeed to libc++."
* commit '036ffbce1b8ca4032f05feab5e35c67212cb265e':
Move libvariablespeed to libc++.
|
| 036ffbce1b8ca4032f05feab5e35c67212cb265e |
16-Nov-2014 |
Dan Albert <danalbert@google.com> |
am 842e82f6: Merge "Move libvariablespeed to libc++."
* commit '842e82f6b8d85c71469f4decdfd5d1a486d55881':
Move libvariablespeed to libc++.
|
| 842e82f6b8d85c71469f4decdfd5d1a486d55881 |
16-Nov-2014 |
Dan Albert <danalbert@google.com> |
Merge "Move libvariablespeed to libc++."
|
| d87b2d6567746a5e26ae5eba03830db8c297d0d4 |
16-Nov-2014 |
Dan Albert <danalbert@google.com> |
Move libvariablespeed to libc++.
Bug: 15193147
Change-Id: Ie582a5789fea7fa83442d998b0d27388176e4e77
ariablespeed/jni/Android.mk
ariablespeed/jni/ring_buffer.cc
|
| 723968fa7be64ed21e892465a88ff01902c0c512 |
13-Nov-2014 |
Qiwen Zhao <zhao@google.com> |
am 0c2eb842: am ede5a97a: Merge commit \'25b78c8a18327bd73c3d4d34887dd63953aeaa8c\' into lmp-mr1-dev
* commit '0c2eb84264c5c5a9f4c9e7187bf926296ee49511':
Ensure default handler always is set if no other error handler registered
|
| e52ac94d94a03e0356d241f264e7b04ba7e2a49b |
13-Nov-2014 |
Qiwen Zhao <zhao@google.com> |
am 2c10ad01: am e7e528ac: Merge commit \'c15ddae4862bb9a10b0142fac9558a5f899b1a21\' into lmp-mr1-dev
* commit '2c10ad010dc8650d43b893ecba23091e9e0dd250':
Ensure agent error handler is always non-null
|
| d4cf288862fa0bfac5299d3b3ea22d3f8924baef |
13-Nov-2014 |
Qiwen Zhao <zhao@google.com> |
am f7400b8a: am 3238136a: Merge commit \'733ca8dfa76ac34d1f9caff8798d01a4a8f44002\' into lmp-mr1-dev
* commit 'f7400b8ad32e57b89840b53c94a9fbcca66fcc5f':
Return more detailed debugging info for logging purposes.
|
| 3a7ddc3a379315a210767ce0069b9a0bce1c9990 |
13-Nov-2014 |
Qiwen Zhao <zhao@google.com> |
am 41663542: am 7ce2ce7d: Merge commit \'318eeb225f4567a8c2a6fe14baa06e8923ebe622\' into lmp-mr1-dev
* commit '41663542e572c06b1be98d0b4c0bc198a43242e0':
Cleanup: handle API 1 error callback in CameraExceptionHandler.
|
| a41997c77916a560139aefbdce519aa0dbff839e |
13-Nov-2014 |
Qiwen Zhao <zhao@google.com> |
am 97024451: am a84d38ef: Merge commit \'2d01b8e2b5ad30ce3c442799cad4c3d26607fc6f\' into lmp-mr1-dev
* commit '970244510e092d91c11b213440cfa6c194cfafca':
Overhaul error handling in AndroidCameraAgentImpl.
|
| 8d061b1424d23be4f56569357b2899cb75e86d4e |
13-Nov-2014 |
Qiwen Zhao <zhao@google.com> |
am 3f67d845: am aacce208: Merge commit \'90e75d1f90b85e11f6905966ea28d59916935c68\' into lmp-mr1-dev
* commit '3f67d845af493927f81889b0ca4087a1c4a9871b':
Check isZoomSupported before any zoom ratio calculations.
|
| 2591cce2de081ec3a92e245145815d316599e698 |
13-Nov-2014 |
Qiwen Zhao <zhao@google.com> |
am a5fa3b21: am 52d378bc: Merge commit \'698997b9ef47f215350f03c0289f291846cd3604\' into lmp-mr1-dev
* commit 'a5fa3b21247ef211eb8225aec96cb7683d161ed2':
Add null check for exif thumbnail size
|
| 4991b63c878b146a06a3b47b14f4d83a1842ead5 |
13-Nov-2014 |
Qiwen Zhao <zhao@google.com> |
am 7d5fcf19: am a3d310ed: Merge commit \'1c1d1afb5701b78fcdf09969bba1c20eb591bccf\' into lmp-mr1-dev
* commit '7d5fcf19f74ce8a0ec62bfa6e76ebaaeafb6cbc4':
Remove default thumbnail size setting in portability lib
|
| 0c2eb84264c5c5a9f4c9e7187bf926296ee49511 |
13-Nov-2014 |
Qiwen Zhao <zhao@google.com> |
am ede5a97a: Merge commit \'25b78c8a18327bd73c3d4d34887dd63953aeaa8c\' into lmp-mr1-dev
* commit 'ede5a97a7ed75ac04dfa58c3b867e67ea4e80f92':
Ensure default handler always is set if no other error handler registered
|
| 2c10ad010dc8650d43b893ecba23091e9e0dd250 |
13-Nov-2014 |
Qiwen Zhao <zhao@google.com> |
am e7e528ac: Merge commit \'c15ddae4862bb9a10b0142fac9558a5f899b1a21\' into lmp-mr1-dev
* commit 'e7e528accaef2dfdc4c74c3ad116ede1cbb0c2e9':
Ensure agent error handler is always non-null
|
| f7400b8ad32e57b89840b53c94a9fbcca66fcc5f |
13-Nov-2014 |
Qiwen Zhao <zhao@google.com> |
am 3238136a: Merge commit \'733ca8dfa76ac34d1f9caff8798d01a4a8f44002\' into lmp-mr1-dev
* commit '3238136a95ea85c0283a1b623e501c835ed5b753':
Return more detailed debugging info for logging purposes.
|
| 41663542e572c06b1be98d0b4c0bc198a43242e0 |
13-Nov-2014 |
Qiwen Zhao <zhao@google.com> |
am 7ce2ce7d: Merge commit \'318eeb225f4567a8c2a6fe14baa06e8923ebe622\' into lmp-mr1-dev
* commit '7ce2ce7d166d839eb62e03b4cdad7fad4b5e267a':
Cleanup: handle API 1 error callback in CameraExceptionHandler.
|
| 970244510e092d91c11b213440cfa6c194cfafca |
13-Nov-2014 |
Qiwen Zhao <zhao@google.com> |
am a84d38ef: Merge commit \'2d01b8e2b5ad30ce3c442799cad4c3d26607fc6f\' into lmp-mr1-dev
* commit 'a84d38ef1687853d1e1e6d1e05533c80405fa322':
Overhaul error handling in AndroidCameraAgentImpl.
|
| 3f67d845af493927f81889b0ca4087a1c4a9871b |
13-Nov-2014 |
Qiwen Zhao <zhao@google.com> |
am aacce208: Merge commit \'90e75d1f90b85e11f6905966ea28d59916935c68\' into lmp-mr1-dev
* commit 'aacce208f76035a8f7453acc66a0b52e3434babd':
Check isZoomSupported before any zoom ratio calculations.
|
| a5fa3b21247ef211eb8225aec96cb7683d161ed2 |
13-Nov-2014 |
Qiwen Zhao <zhao@google.com> |
am 52d378bc: Merge commit \'698997b9ef47f215350f03c0289f291846cd3604\' into lmp-mr1-dev
* commit '52d378bc6bede2c8019134e9c952c14869f226cb':
Add null check for exif thumbnail size
|
| 7d5fcf19f74ce8a0ec62bfa6e76ebaaeafb6cbc4 |
13-Nov-2014 |
Qiwen Zhao <zhao@google.com> |
am a3d310ed: Merge commit \'1c1d1afb5701b78fcdf09969bba1c20eb591bccf\' into lmp-mr1-dev
* commit 'a3d310ed23dadd652733854f6dd4ad565e5942d3':
Remove default thumbnail size setting in portability lib
|
| ede5a97a7ed75ac04dfa58c3b867e67ea4e80f92 |
12-Nov-2014 |
Qiwen Zhao <zhao@google.com> |
Merge commit '25b78c8a18327bd73c3d4d34887dd63953aeaa8c' into lmp-mr1-dev
|
| e7e528accaef2dfdc4c74c3ad116ede1cbb0c2e9 |
12-Nov-2014 |
Qiwen Zhao <zhao@google.com> |
Merge commit 'c15ddae4862bb9a10b0142fac9558a5f899b1a21' into lmp-mr1-dev
|
| 3238136a95ea85c0283a1b623e501c835ed5b753 |
12-Nov-2014 |
Qiwen Zhao <zhao@google.com> |
Merge commit '733ca8dfa76ac34d1f9caff8798d01a4a8f44002' into lmp-mr1-dev
|
| 7ce2ce7d166d839eb62e03b4cdad7fad4b5e267a |
12-Nov-2014 |
Qiwen Zhao <zhao@google.com> |
Merge commit '318eeb225f4567a8c2a6fe14baa06e8923ebe622' into lmp-mr1-dev
|
| a84d38ef1687853d1e1e6d1e05533c80405fa322 |
12-Nov-2014 |
Qiwen Zhao <zhao@google.com> |
Merge commit '2d01b8e2b5ad30ce3c442799cad4c3d26607fc6f' into lmp-mr1-dev
|
| aacce208f76035a8f7453acc66a0b52e3434babd |
12-Nov-2014 |
Qiwen Zhao <zhao@google.com> |
Merge commit '90e75d1f90b85e11f6905966ea28d59916935c68' into lmp-mr1-dev
|
| 52d378bc6bede2c8019134e9c952c14869f226cb |
12-Nov-2014 |
Qiwen Zhao <zhao@google.com> |
Merge commit '698997b9ef47f215350f03c0289f291846cd3604' into lmp-mr1-dev
|
| a3d310ed23dadd652733854f6dd4ad565e5942d3 |
12-Nov-2014 |
Qiwen Zhao <zhao@google.com> |
Merge commit '1c1d1afb5701b78fcdf09969bba1c20eb591bccf' into lmp-mr1-dev
|
| 25b78c8a18327bd73c3d4d34887dd63953aeaa8c |
04-Nov-2014 |
Alan Newberger <alann@google.com> |
Ensure default handler always is set if no other error handler registered
To avoid memory leaks we set the error handler to null in activity
onDestroy. But, the agent may receive callbacks after this, so
ensure at minimum that we set the default logging handler to default
handle errors post activity destroy.
Bug: 18200874
Bug: 18202261
Change-Id: Ie7251a149ab02c474d8affd15af6b9ea48c2cdc0
amera2/portability/src/com/android/ex/camera2/portability/AndroidCameraAgentImpl.java
|
| c15ddae4862bb9a10b0142fac9558a5f899b1a21 |
27-Oct-2014 |
Alan Newberger <alann@google.com> |
Ensure agent error handler is always non-null
Create a dummy placeholder handler which logs warnings, which
can be replaced by app if desired. This makes various assumptions
valid that this is non-null.
Bug: 18137167
Change-Id: I0f508dff3cfe766ccc5a3c5a26c6196f4fb31e04
amera2/portability/src/com/android/ex/camera2/portability/AndroidCameraAgentImpl.java
|
| 1b2e72c97e9b4f7d5d8b5fdc0a5086890eadfbba |
27-Oct-2014 |
Senpo Hu <senpo@google.com> |
am 782bac7b: am 21e5d240: am 70a82d9d: Add null check in AndroidCameraSettings.
* commit '782bac7b2818d96e56ab1e304f9f150bef70e8aa':
|
| e68f6219b35f76f22d92406d2fbe865ed3314e53 |
27-Oct-2014 |
Alan Newberger <alann@google.com> |
am efd94f33: am 0ea96753: am 2eed7ab0: Merge "Specify Locale.US for stringification of enums" into lmp-dev
* commit 'efd94f33a32ca8bd05ba599caaa8ac0e531c72f9':
|
| 015436c7c0f80c9b78f9b025ceab05e4c0ed92a8 |
27-Oct-2014 |
Alan Newberger <alann@google.com> |
am 23522362: am 5f6b2905: am bad9708b: Add error log to API1 CameraAgent
* commit '23522362c73b5bfadb92a95ecbc39f56708a8fbe':
|
| 782bac7b2818d96e56ab1e304f9f150bef70e8aa |
27-Oct-2014 |
Senpo Hu <senpo@google.com> |
am 21e5d240: am 70a82d9d: Add null check in AndroidCameraSettings.
* commit '21e5d2401d605b31bccd6357da4ee7c49cf08aed':
|
| efd94f33a32ca8bd05ba599caaa8ac0e531c72f9 |
27-Oct-2014 |
Alan Newberger <alann@google.com> |
am 0ea96753: am 2eed7ab0: Merge "Specify Locale.US for stringification of enums" into lmp-dev
* commit '0ea96753473345ed5aa5ac97da03f632bda8cf59':
|
| 23522362c73b5bfadb92a95ecbc39f56708a8fbe |
27-Oct-2014 |
Alan Newberger <alann@google.com> |
am 5f6b2905: am bad9708b: Add error log to API1 CameraAgent
* commit '5f6b29054ce1ec000e2e90983e0762e0510a694f':
|
| 0566a7ca2d0287e9342d80dc0fcbb054e273ee60 |
25-Oct-2014 |
Senpo Hu <senpo@google.com> |
am e5b1e8b9: am 2f525107: Overhaul error handling in AndroidCameraAgentImpl.
* commit 'e5b1e8b91de6beaac0b1d4520ca5d3e2361632bd':
Overhaul error handling in AndroidCameraAgentImpl.
|
| e5b1e8b91de6beaac0b1d4520ca5d3e2361632bd |
25-Oct-2014 |
Senpo Hu <senpo@google.com> |
am 2f525107: Overhaul error handling in AndroidCameraAgentImpl.
* commit '2f5251072284508374cb36d1e83f7e24cc590049':
Overhaul error handling in AndroidCameraAgentImpl.
|
| 2f5251072284508374cb36d1e83f7e24cc590049 |
06-Oct-2014 |
Senpo Hu <senpo@google.com> |
Overhaul error handling in AndroidCameraAgentImpl.
DispatchThread could throw RTE when timeout (2500 ms). This CL extends
it to 3500 ms and also re-route the exception to the proper exception
callback instead of surfacing that up to the app. Since a lot of try-catch
block is added, CameraExceptionHandler class is added to keep
CameraAgent.java clean.
The portability layer should ensure the proper use of Camera API 1. With
this assumption, any run time exception thrown by the framework should be
considered fatal. Once it happened, CameraAgent/CameraProxy should be
invalidated. Any subsequent camera commands should be gated as no-ops to
prevent HAL hanging symptom. Users should be guided to exit the app and
recover from the camera error.
Design Doc:
https://docs.google.com/a/google.com/document/d/1t0sEPwGgc387XcoCVC7kT9Y_RSZPxcayla03M4bdn0U/edit
Corresponding CL for the app layer: ag/562383
Bug: 16189216
Change-Id: I33e69aeff0c8e4211e82e0e83133915700c4eb8f
amera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2AgentImpl.java
amera2/portability/src/com/android/ex/camera2/portability/AndroidCameraAgentImpl.java
amera2/portability/src/com/android/ex/camera2/portability/CameraAgent.java
amera2/portability/src/com/android/ex/camera2/portability/CameraExceptionHandler.java
amera2/portability/src/com/android/ex/camera2/portability/CameraStateHolder.java
|
| 733ca8dfa76ac34d1f9caff8798d01a4a8f44002 |
14-Oct-2014 |
Senpo Hu <senpo@google.com> |
Return more detailed debugging info for logging purposes.
Change-Id: If71afbf8029e9e4d5560eb6a655ece990cf19a19
amera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2AgentImpl.java
amera2/portability/src/com/android/ex/camera2/portability/AndroidCameraAgentImpl.java
amera2/portability/src/com/android/ex/camera2/portability/CameraExceptionHandler.java
amera2/portability/src/com/android/ex/camera2/portability/HistoryHandler.java
|
| 318eeb225f4567a8c2a6fe14baa06e8923ebe622 |
11-Oct-2014 |
Senpo Hu <senpo@google.com> |
Cleanup: handle API 1 error callback in CameraExceptionHandler.
Portability API used to expose setErrorCallback call which is API 1
only. The new CameraExceptionHandler should be the centralized place
to handle different camera errors.
Bug: 17931297
Change-Id: I0212f96a98e0caca64aca0f947b991b895d8d56b
amera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2AgentImpl.java
amera2/portability/src/com/android/ex/camera2/portability/AndroidCameraAgentImpl.java
amera2/portability/src/com/android/ex/camera2/portability/CameraActions.java
amera2/portability/src/com/android/ex/camera2/portability/CameraAgent.java
amera2/portability/src/com/android/ex/camera2/portability/CameraExceptionHandler.java
|
| 2d01b8e2b5ad30ce3c442799cad4c3d26607fc6f |
06-Oct-2014 |
Senpo Hu <senpo@google.com> |
Overhaul error handling in AndroidCameraAgentImpl.
DispatchThread could throw RTE when timeout (2500 ms). This CL extends
it to 3500 ms and also re-route the exception to the proper exception
callback instead of surfacing that up to the app. Since a lot of try-catch
block is added, CameraExceptionHandler class is added to keep
CameraAgent.java clean.
The portability layer should ensure the proper use of Camera API 1. With
this assumption, any run time exception thrown by the framework should be
considered fatal. Once it happened, CameraAgent/CameraProxy should be
invalidated. Any subsequent camera commands should be gated as no-ops to
prevent HAL hanging symptom. Users should be guided to exit the app and
recover from the camera error.
Design Doc:
https://docs.google.com/a/google.com/document/d/1t0sEPwGgc387XcoCVC7kT9Y_RSZPxcayla03M4bdn0U/edit
Corresponding CL for the app layer: ag/562383
Bug: 16189216
Change-Id: I33e69aeff0c8e4211e82e0e83133915700c4eb8f
amera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2AgentImpl.java
amera2/portability/src/com/android/ex/camera2/portability/AndroidCameraAgentImpl.java
amera2/portability/src/com/android/ex/camera2/portability/CameraAgent.java
amera2/portability/src/com/android/ex/camera2/portability/CameraExceptionHandler.java
amera2/portability/src/com/android/ex/camera2/portability/CameraStateHolder.java
|
| 90e75d1f90b85e11f6905966ea28d59916935c68 |
05-Oct-2014 |
Alan Newberger <alann@google.com> |
Check isZoomSupported before any zoom ratio calculations.
Per API doc, isZoomeSupported should be checked before calling
getZoomRatios or getMaxZoom. Moving zoom calculation into
isZoomSupported check fixed crash in front camera with no zoom
support, where a HAL/fwk returns a null list of zoom ratios.
Bug: 17863266
Change-Id: I80b5f7a431e7bbe4d50e5d062628e38eda3fd0a6
amera2/portability/src/com/android/ex/camera2/portability/AndroidCameraCapabilities.java
|
| 698997b9ef47f215350f03c0289f291846cd3604 |
03-Oct-2014 |
Puneet Lall <puneetl@google.com> |
Add null check for exif thumbnail size
Bug:17790747
Change-Id: I758bb217d0a76093d8e4bb1832cc7ab6907235ee
amera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2Settings.java
|
| 1c1d1afb5701b78fcdf09969bba1c20eb591bccf |
30-Sep-2014 |
Alan Newberger <alann@google.com> |
Remove default thumbnail size setting in portability lib
Settings thumbnail size to (0,0) suppresses thumbnail generation. The
Camera app did not set to (0,0) explicitly, but when porting
Camera.Parameters to CameraSettings this crept in. Causes issue on
Nakasi and no reason to suppress thumbnails in general.
Bug: 17700333
Change-Id: I486e560bc9aaf05daf019a3aad8de78ee306f21b
amera2/portability/src/com/android/ex/camera2/portability/AndroidCameraAgentImpl.java
amera2/portability/src/com/android/ex/camera2/portability/CameraSettings.java
|
| 2b0e0221dca7fcbb145e59a66a6e6646be92eb2c |
25-Sep-2014 |
Senpo Hu <senpo@google.com> |
am 67a37742: am 70a82d9d: Add null check in AndroidCameraSettings.
* commit '67a37742d405821c239515f7779968e5a8745ea0':
Add null check in AndroidCameraSettings.
|
| 67a37742d405821c239515f7779968e5a8745ea0 |
25-Sep-2014 |
Senpo Hu <senpo@google.com> |
am 70a82d9d: Add null check in AndroidCameraSettings.
* commit '70a82d9d9a59c2a0b9241fdb0b8b0f1a61d0d5a0':
Add null check in AndroidCameraSettings.
|
| 21e5d2401d605b31bccd6357da4ee7c49cf08aed |
25-Sep-2014 |
Senpo Hu <senpo@google.com> |
am 70a82d9d: Add null check in AndroidCameraSettings.
* commit '70a82d9d9a59c2a0b9241fdb0b8b0f1a61d0d5a0':
Add null check in AndroidCameraSettings.
|
| 70a82d9d9a59c2a0b9241fdb0b8b0f1a61d0d5a0 |
24-Sep-2014 |
Senpo Hu <senpo@google.com> |
Add null check in AndroidCameraSettings.
Check Camera.Parameters is null in AndroidCameraSettings ctor.
This should also fix the NPE bug b/17620440.
Bug: 17555612
Change-Id: Iee5f41b5d47eced3155e31c09f267eaa61c7de39
amera2/portability/src/com/android/ex/camera2/portability/AndroidCameraSettings.java
|
| 140d7c2eff38bdb0ea0cb93dff30a444adfbd5b6 |
23-Sep-2014 |
Alan Newberger <alann@google.com> |
am 3dcdd9f4: am 2eed7ab0: Merge "Specify Locale.US for stringification of enums" into lmp-dev
* commit '3dcdd9f47ae4bae22e67dfe072925e589aac6fd4':
Specify Locale.US for stringification of enums
|
| 87b979df3399bdd85487a7f63f9f0d3a25cf49aa |
23-Sep-2014 |
Alan Newberger <alann@google.com> |
am f47437ae: am bad9708b: Add error log to API1 CameraAgent
* commit 'f47437ae7803f1ebc12279a45e9b7ce9a8b7e5f5':
Add error log to API1 CameraAgent
|
| 3dcdd9f47ae4bae22e67dfe072925e589aac6fd4 |
23-Sep-2014 |
Alan Newberger <alann@google.com> |
am 2eed7ab0: Merge "Specify Locale.US for stringification of enums" into lmp-dev
* commit '2eed7ab0e5d81c0025737c6ce9931f3d8b57b418':
Specify Locale.US for stringification of enums
|
| f47437ae7803f1ebc12279a45e9b7ce9a8b7e5f5 |
23-Sep-2014 |
Alan Newberger <alann@google.com> |
am bad9708b: Add error log to API1 CameraAgent
* commit 'bad9708bd92213e65bfc9761ce3e69f8a59e1483':
Add error log to API1 CameraAgent
|
| 0ea96753473345ed5aa5ac97da03f632bda8cf59 |
23-Sep-2014 |
Alan Newberger <alann@google.com> |
am 2eed7ab0: Merge "Specify Locale.US for stringification of enums" into lmp-dev
* commit '2eed7ab0e5d81c0025737c6ce9931f3d8b57b418':
Specify Locale.US for stringification of enums
|
| 5f6b29054ce1ec000e2e90983e0762e0510a694f |
23-Sep-2014 |
Alan Newberger <alann@google.com> |
am bad9708b: Add error log to API1 CameraAgent
* commit 'bad9708bd92213e65bfc9761ce3e69f8a59e1483':
Add error log to API1 CameraAgent
|
| 2eed7ab0e5d81c0025737c6ce9931f3d8b57b418 |
23-Sep-2014 |
Alan Newberger <alann@google.com> |
Merge "Specify Locale.US for stringification of enums" into lmp-dev
|
| 1bd78b36e275371eff1ec1d07c9c1f93f63f5c39 |
23-Sep-2014 |
Alan Newberger <alann@google.com> |
Specify Locale.US for stringification of enums
For machine-readable enum translation, use Locale.US which will preserve
english enum casing and is recommended in Locale docs.
Bug: 17557568
Change-Id: I40274bccdb593889c8ded003a5fb731f45892d7b
amera2/portability/src/com/android/ex/camera2/portability/CameraCapabilities.java
|
| bad9708bd92213e65bfc9761ce3e69f8a59e1483 |
23-Sep-2014 |
Alan Newberger <alann@google.com> |
Add error log to API1 CameraAgent
Right when an error occurs, log it before doing further error handling.
Bug: 17555612
Change-Id: I23c828f3ff0749643e490a431b71318004c6d692
amera2/portability/src/com/android/ex/camera2/portability/AndroidCameraAgentImpl.java
|
| 13657e2d6757531a7bf0654bb847ac8c6faa5c43 |
12-Sep-2014 |
Dan Albert <danalbert@google.com> |
am 9e8e9655: am c8e9c014: Merge "Clean up makefile cruft."
* commit '9e8e96556697c955d4eea058ac051f11aea0a3b5':
Clean up makefile cruft.
|
| 9e8e96556697c955d4eea058ac051f11aea0a3b5 |
12-Sep-2014 |
Dan Albert <danalbert@google.com> |
am c8e9c014: Merge "Clean up makefile cruft."
* commit 'c8e9c0148525d853588f606fe8315368ea134615':
Clean up makefile cruft.
|
| c8e9c0148525d853588f606fe8315368ea134615 |
12-Sep-2014 |
Dan Albert <danalbert@google.com> |
Merge "Clean up makefile cruft."
|
| 38e0996658fd6aaa8d6024cb05b609f87b7b22f9 |
12-Sep-2014 |
Dan Albert <danalbert@google.com> |
Clean up makefile cruft.
Don't manually include/link stlport, don't include private bionic
headers.
Change-Id: Id21e2d0131b0bb5a2b567016faebff28ab6d5995
ariablespeed/jni/Android.mk
|
| b8d9bb07f41fb208f6b6a6053af87c3406a67989 |
10-Sep-2014 |
Eino-Ville Talvala <etalvala@google.com> |
am 9d283076: am 06b23bb5: Merge "Camera2: Update for camera2 API changes" into lmp-dev
* commit '9d283076744f1d8f5166476b747f23c3bc443aba':
Camera2: Update for camera2 API changes
|
| b0aebf7db418156d4ca3afbe51260314a5ed446e |
10-Sep-2014 |
Rachad Alao <rachad@google.com> |
am 2ad38174: am 9f57c438: Merge "portability: Fix a bug where long AF callbacks caused ISE timeouts" into lmp-dev
* commit '2ad38174f2adfd09bc9b28087820079575877645':
portability: Fix a bug where long AF callbacks caused ISE timeouts
|
| 9d283076744f1d8f5166476b747f23c3bc443aba |
10-Sep-2014 |
Eino-Ville Talvala <etalvala@google.com> |
am 06b23bb5: Merge "Camera2: Update for camera2 API changes" into lmp-dev
* commit '06b23bb5cbddfed587a6f0d75636734862b49a1e':
Camera2: Update for camera2 API changes
|
| 2ad38174f2adfd09bc9b28087820079575877645 |
10-Sep-2014 |
Rachad Alao <rachad@google.com> |
am 9f57c438: Merge "portability: Fix a bug where long AF callbacks caused ISE timeouts" into lmp-dev
* commit '9f57c438ea0c7f02d0e86ade6a5e36c8993dd9fc':
portability: Fix a bug where long AF callbacks caused ISE timeouts
|
| 06b23bb5cbddfed587a6f0d75636734862b49a1e |
10-Sep-2014 |
Eino-Ville Talvala <etalvala@google.com> |
Merge "Camera2: Update for camera2 API changes" into lmp-dev
|
| d749fc3aeea7e5a31c94da1650f388d63eacb205 |
10-Sep-2014 |
Senpo Hu <senpo@google.com> |
am e46a8378: am 25ee73ac: Let CameraProxy support setJpegOrientation.
* commit 'e46a8378bc9d05ea41eca153f98b00e43ff9f70b':
Let CameraProxy support setJpegOrientation.
|
| 9f57c438ea0c7f02d0e86ade6a5e36c8993dd9fc |
09-Sep-2014 |
Rachad Alao <rachad@google.com> |
Merge "portability: Fix a bug where long AF callbacks caused ISE timeouts" into lmp-dev
|
| e46a8378bc9d05ea41eca153f98b00e43ff9f70b |
09-Sep-2014 |
Senpo Hu <senpo@google.com> |
am 25ee73ac: Let CameraProxy support setJpegOrientation.
* commit '25ee73acd2dbd6f60deef5306994fbf3a7997936':
Let CameraProxy support setJpegOrientation.
|
| 25ee73acd2dbd6f60deef5306994fbf3a7997936 |
09-Sep-2014 |
Senpo Hu <senpo@google.com> |
Let CameraProxy support setJpegOrientation.
When device is locked in portrait, JPEG orientation and preview
orientation might be different.
Bug: 17360176
Change-Id: I16ee937c4d930e5f02a3e703dffd3bdd63e0e367
amera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2AgentImpl.java
amera2/portability/src/com/android/ex/camera2/portability/AndroidCameraAgentImpl.java
amera2/portability/src/com/android/ex/camera2/portability/CameraActions.java
amera2/portability/src/com/android/ex/camera2/portability/CameraAgent.java
|
| 6a9babad6eb8ac3e79a5e036d878ed7408e79f26 |
09-Sep-2014 |
Igor Murashkin <iam@google.com> |
portability: Fix a bug where long AF callbacks caused ISE timeouts
Bug: 17403384
Change-Id: I2f452f79ffb4c0c3327ea5bf7db3f9d26e98ff51
amera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2AgentImpl.java
amera2/portability/src/com/android/ex/camera2/portability/AndroidCameraAgentImpl.java
amera2/portability/src/com/android/ex/camera2/portability/CameraActions.java
amera2/portability/src/com/android/ex/camera2/portability/CameraAgent.java
amera2/portability/src/com/android/ex/camera2/portability/CameraStateHolder.java
|
| 117d86a691aabdc68fdac88234084d53f8aad15e |
09-Sep-2014 |
Alan Newberger <alann@google.com> |
am 6c2fa7f2: am ca507f86: Merge "Log null returns from Camera.getParameters" into lmp-dev
* commit '6c2fa7f20c7dc4f2d425f07b39cb574291c3ed15':
Log null returns from Camera.getParameters
|
| 6c2fa7f20c7dc4f2d425f07b39cb574291c3ed15 |
09-Sep-2014 |
Alan Newberger <alann@google.com> |
am ca507f86: Merge "Log null returns from Camera.getParameters" into lmp-dev
* commit 'ca507f86d3d5e4f16ebd666a2b42664e5178eceb':
Log null returns from Camera.getParameters
|
| ca507f86d3d5e4f16ebd666a2b42664e5178eceb |
09-Sep-2014 |
Alan Newberger <alann@google.com> |
Merge "Log null returns from Camera.getParameters" into lmp-dev
|
| 171362f843c1e7623f29db1781176f85b1f74815 |
09-Sep-2014 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Update for camera2 API changes
Add frame number to CaptureCallback#onCaptureStarted
Bug: 17421092
Change-Id: I8ffc0c7c22a5f3a25e923aaf1ecf166c7a264508
amera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2AgentImpl.java
amera2/public/src/com/android/ex/camera2/blocking/BlockingCaptureCallback.java
amera2/utils/src/com/android/ex/camera2/utils/Camera2CaptureCallbackForwarder.java
amera2/utils/src/com/android/ex/camera2/utils/Camera2CaptureCallbackSplitter.java
amera2/utils/tests/src/com/android/ex/camera2/utils/Camera2UtilsTest.java
|
| f9586d70dc566b86c73e98a93e5bcceee885c89c |
06-Sep-2014 |
Igor Murashkin <iam@google.com> |
am 46637f4b: am d5205c26: Merge "portability: Fix incorrect comparison between int and Integer" into lmp-dev
* commit '46637f4b11090250fb16ce27e50b012351c750e6':
portability: Fix incorrect comparison between int and Integer
|
| 46637f4b11090250fb16ce27e50b012351c750e6 |
06-Sep-2014 |
Igor Murashkin <iam@google.com> |
am d5205c26: Merge "portability: Fix incorrect comparison between int and Integer" into lmp-dev
* commit 'd5205c2648ba1213f28a232379d10b07a7ee9bdc':
portability: Fix incorrect comparison between int and Integer
|
| d5205c2648ba1213f28a232379d10b07a7ee9bdc |
06-Sep-2014 |
Igor Murashkin <iam@google.com> |
Merge "portability: Fix incorrect comparison between int and Integer" into lmp-dev
|
| 4dfd5db322e9732072d49c84cb749addca951936 |
06-Sep-2014 |
Eino-Ville Talvala <etalvala@google.com> |
am 3d63c611: am bb013aa3: Camera2: Renames for API consistency
* commit '3d63c61135a25a725dba50180c21254eb436e3b2':
Camera2: Renames for API consistency
|
| 3d63c61135a25a725dba50180c21254eb436e3b2 |
05-Sep-2014 |
Eino-Ville Talvala <etalvala@google.com> |
am bb013aa3: Camera2: Renames for API consistency
* commit 'bb013aa3e197e881756be5ad13e6ad30bfb4aeff':
Camera2: Renames for API consistency
|
| bb013aa3e197e881756be5ad13e6ad30bfb4aeff |
04-Sep-2014 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Renames for API consistency
- Listener -> Callback
- add/remove callbacks -> register/unregister
Bug: 17389922
Change-Id: I6e162ae18447b5a4fcabc17d17b1341f341fc47d
amera2/Android.mk
amera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2AgentImpl.java
amera2/public/src/com/android/ex/camera2/blocking/BlockingCameraManager.java
amera2/public/src/com/android/ex/camera2/blocking/BlockingCaptureCallback.java
amera2/public/src/com/android/ex/camera2/blocking/BlockingCaptureListener.java
amera2/public/src/com/android/ex/camera2/blocking/BlockingSessionCallback.java
amera2/public/src/com/android/ex/camera2/blocking/BlockingSessionListener.java
amera2/public/src/com/android/ex/camera2/blocking/BlockingStateCallback.java
amera2/public/src/com/android/ex/camera2/blocking/BlockingStateListener.java
amera2/public/src/com/android/ex/camera2/pos/AutoFocusStateMachine.java
amera2/utils/src/com/android/ex/camera2/utils/Camera2CaptureCallbackForwarder.java
amera2/utils/src/com/android/ex/camera2/utils/Camera2CaptureCallbackSplitter.java
amera2/utils/src/com/android/ex/camera2/utils/Camera2CaptureListenerForwarder.java
amera2/utils/src/com/android/ex/camera2/utils/Camera2CaptureListenerSplitter.java
amera2/utils/tests/src/com/android/ex/camera2/utils/Camera2DeviceTester.java
amera2/utils/tests/src/com/android/ex/camera2/utils/Camera2UtilsTest.java
|
| dc05ed7a8443af7c1a7b1bb39519d09d79284e42 |
05-Sep-2014 |
Igor Murashkin <iam@google.com> |
portability: Fix incorrect comparison between int and Integer
Bug: 17405119
Change-Id: Ic4828b5ddee2b11fa9886506e48c640a4c5ad3ef
amera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2Settings.java
|
| 3d3a36bd1a3b1da99a0b262dfbc5099929155d00 |
04-Sep-2014 |
Ruben Brunk <rubenbrunk@google.com> |
am 320ae7b7: am 3b7da912: ex: Avoid exception if HDR_SCENE_MODE name changes.
* commit '320ae7b7410342eedb7b689bb5a84323f3c125d8':
ex: Avoid exception if HDR_SCENE_MODE name changes.
|
| 320ae7b7410342eedb7b689bb5a84323f3c125d8 |
04-Sep-2014 |
Ruben Brunk <rubenbrunk@google.com> |
am 3b7da912: ex: Avoid exception if HDR_SCENE_MODE name changes.
* commit '3b7da912d573f358fd217f6d9b569cca648efe02':
ex: Avoid exception if HDR_SCENE_MODE name changes.
|
| 3b7da912d573f358fd217f6d9b569cca648efe02 |
04-Sep-2014 |
Ruben Brunk <rubenbrunk@google.com> |
ex: Avoid exception if HDR_SCENE_MODE name changes.
Bug: 17353543
Change-Id: I31448687a69afc66e93f4360e8a3186ff8ad6235
amera2/portability/src/com/android/ex/camera2/portability/LegacyVendorTags.java
|
| ae94b772670158f863906a08cc5ef7aca9ca380f |
02-Sep-2014 |
Ruben Brunk <rubenbrunk@google.com> |
am 0497ec6e: am 9fb7e160: Merge "camera2: Add HDR vendor tag for legacy mode." into lmp-dev
* commit '0497ec6e0b24e5153dda7dcd7ff82cfabfcfdf18':
camera2: Add HDR vendor tag for legacy mode.
|
| 48935b88e363fcb00211f3bd4ca361d625e39a55 |
02-Sep-2014 |
Igor Murashkin <iam@google.com> |
am df8bf90c: am 58774cf3: Merge "camera2-portability: Touch-to-focus accounting for effective crop" into lmp-dev
* commit 'df8bf90c8b1753a9e233f7694881c4c5bb172812':
camera2-portability: Touch-to-focus accounting for effective crop
|
| 0497ec6e0b24e5153dda7dcd7ff82cfabfcfdf18 |
30-Aug-2014 |
Ruben Brunk <rubenbrunk@google.com> |
am 9fb7e160: Merge "camera2: Add HDR vendor tag for legacy mode." into lmp-dev
* commit '9fb7e16061ae2f3d3b059952706a1e1a1b439d6b':
camera2: Add HDR vendor tag for legacy mode.
|
| 9fb7e16061ae2f3d3b059952706a1e1a1b439d6b |
30-Aug-2014 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "camera2: Add HDR vendor tag for legacy mode." into lmp-dev
|
| df8bf90c8b1753a9e233f7694881c4c5bb172812 |
30-Aug-2014 |
Igor Murashkin <iam@google.com> |
am 58774cf3: Merge "camera2-portability: Touch-to-focus accounting for effective crop" into lmp-dev
* commit '58774cf3543e06c4b51a54bccd603a2cbcd7a816':
camera2-portability: Touch-to-focus accounting for effective crop
|
| 58774cf3543e06c4b51a54bccd603a2cbcd7a816 |
30-Aug-2014 |
Igor Murashkin <iam@google.com> |
Merge "camera2-portability: Touch-to-focus accounting for effective crop" into lmp-dev
|
| 118220e6810157bb7ef8d3cfed1bbc2b928766fa |
29-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
am 5537c7c1: am f73c6cf2: Add ability to reset focus and metering regions using API1.
* commit '5537c7c145c8be2289772910eb4a60b43de8c30f':
Add ability to reset focus and metering regions using API1.
|
| 5537c7c145c8be2289772910eb4a60b43de8c30f |
29-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
am f73c6cf2: Add ability to reset focus and metering regions using API1.
* commit 'f73c6cf2f04451ba4517abccd36a114667c69ae3':
Add ability to reset focus and metering regions using API1.
|
| 2569329d6cff25bfe9941df539df14a0aeb4c4f4 |
29-Aug-2014 |
Sol Boucher <solb@google.com> |
camera2-portability: Touch-to-focus accounting for effective crop
This fixes the calculation of API 2 focus and metering rectangles to account for
the effective crop region (after the framework has performed automatic cropping
to match the requested output aspect ratio). It also guards against and prints
warnings when changing the resolution after having configured the session and
surfaces; before, this was merely a silent no-op.
Bug: 17187095
Change-Id: I3243bea24d6936d1bba5d556b3846d172ad0defe
amera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2AgentImpl.java
amera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2Settings.java
amera2/portability/src/com/android/ex/camera2/portability/AndroidCameraAgentImpl.java
amera2/portability/src/com/android/ex/camera2/portability/AndroidCameraSettings.java
amera2/portability/src/com/android/ex/camera2/portability/CameraAgent.java
amera2/portability/src/com/android/ex/camera2/portability/CameraSettings.java
|
| 54c8f898815a233ba6478630940432ddafdb4314 |
28-Aug-2014 |
Ruben Brunk <rubenbrunk@google.com> |
camera2: Add HDR vendor tag for legacy mode.
Bug: 17072609
Change-Id: Iebb97d12fc62986ad389460c253cfc504a68ad7f
amera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2Capabilities.java
amera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2Settings.java
amera2/portability/src/com/android/ex/camera2/portability/CameraCapabilities.java
amera2/portability/src/com/android/ex/camera2/portability/LegacyVendorTags.java
|
| f73c6cf2f04451ba4517abccd36a114667c69ae3 |
28-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
Add ability to reset focus and metering regions using API1.
Bug: 17286539
Change-Id: Id75bfc594f9fb6a08bb187d053ae99a85e7d9d42
amera2/portability/src/com/android/ex/camera2/portability/AndroidCameraAgentImpl.java
|
| 893a53497d189ede00ca03ac67d1bb767f3378ec |
28-Aug-2014 |
Sol Boucher <solb@google.com> |
am 25c45cca: am 415cf3ee: camera2-portability: Allow disabling the shutter sound on API 2
* commit '25c45cca5f0ee247554d26a3376096ed5c8ec010':
camera2-portability: Allow disabling the shutter sound on API 2
|
| 25c45cca5f0ee247554d26a3376096ed5c8ec010 |
28-Aug-2014 |
Sol Boucher <solb@google.com> |
am 415cf3ee: camera2-portability: Allow disabling the shutter sound on API 2
* commit '415cf3ee18640ad0799e5c9a738afd1d19c14883':
camera2-portability: Allow disabling the shutter sound on API 2
|
| 415cf3ee18640ad0799e5c9a738afd1d19c14883 |
28-Aug-2014 |
Sol Boucher <solb@google.com> |
camera2-portability: Allow disabling the shutter sound on API 2
Because the camera2 API doesn't play shutter sounds at all, the portability
layer does it directly. Consequently, it is trivial to skip that step.
Bug: 17303595
Change-Id: I303696906902c2d8af58baedf27f6e20f34772f1
amera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2AgentImpl.java
|
| a923b9a8142cd3d8438e1feaa3e5ea30fccadf95 |
28-Aug-2014 |
Sol Boucher <solb@google.com> |
am d500784b: am 47a01cf0: Merge "camera2-portability: Fix and document obscure state machine bug" into lmp-dev
* commit 'd500784b9bdca48d19604bb4cebe84ea08c88a90':
camera2-portability: Fix and document obscure state machine bug
|
| d500784b9bdca48d19604bb4cebe84ea08c88a90 |
28-Aug-2014 |
Sol Boucher <solb@google.com> |
am 47a01cf0: Merge "camera2-portability: Fix and document obscure state machine bug" into lmp-dev
* commit '47a01cf05c1e22e76bdf3182461dcfeb71b960bb':
camera2-portability: Fix and document obscure state machine bug
|
| fb47398ff26bf993eac9bff56446bb2c7a20614d |
28-Aug-2014 |
Sol Boucher <solb@google.com> |
am 3a89cdf5: am 7d717032: camera2-portability: Fix camera2 takePicture AE regression
* commit '3a89cdf55cdef9426b0679f4d9e706da3715b2b9':
camera2-portability: Fix camera2 takePicture AE regression
|
| 3a89cdf55cdef9426b0679f4d9e706da3715b2b9 |
28-Aug-2014 |
Sol Boucher <solb@google.com> |
am 7d717032: camera2-portability: Fix camera2 takePicture AE regression
* commit '7d71703202c2fba36653293eba2772745db46c00':
camera2-portability: Fix camera2 takePicture AE regression
|
| 47a01cf05c1e22e76bdf3182461dcfeb71b960bb |
27-Aug-2014 |
Sol Boucher <solb@google.com> |
Merge "camera2-portability: Fix and document obscure state machine bug" into lmp-dev
|
| 7d71703202c2fba36653293eba2772745db46c00 |
27-Aug-2014 |
Sol Boucher <solb@google.com> |
camera2-portability: Fix camera2 takePicture AE regression
This fixes a regression introduced by 984a086412a94ebea1bd9af8cd8bbf4afab38034
that resulted in captures sometimes hanging until the AE state changed. It
includes explanatory comments to guard against this sort of error in the future.
Bug: 17302778
Change-Id: I668f5a5470a0ae7712f62c7574d18360d47e410b
amera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2AgentImpl.java
|
| 772fcce3e51a9c7d33df6a9c278a908ac6902880 |
27-Aug-2014 |
Sol Boucher <solb@google.com> |
camera2-portability: Fix and document obscure state machine bug
The numeric state codes defined by the camera2 implementation were incompatible
with the StateHolder class's wait interface; thus, blocking operations didn't
always behave as expected.
Bug: 17300466
Change-Id: I54f462d5de876c9dcf99b2a4c7ae79879cc0eca2
amera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2AgentImpl.java
|
| d65c1494e7a186753572baa95627e65a4ad6cbf0 |
27-Aug-2014 |
Sol Boucher <solb@google.com> |
am ec891dde: am 7c8d6957: Merge "camera2-portability: Fix zoom occasionally not working" into lmp-dev
* commit 'ec891dde6a5de29ed505692b653f3ba3b3cae81f':
camera2-portability: Fix zoom occasionally not working
|
| aef583021fd9f469d5fb7d35eb9bb941198904cc |
27-Aug-2014 |
Sol Boucher <solb@google.com> |
am 444909d9: am 984a0864: camera2-portability: Optimize out some camera2 AE precaptures
* commit '444909d9aff00d322b5a596e576175bcf1550504':
camera2-portability: Optimize out some camera2 AE precaptures
|
| ec891dde6a5de29ed505692b653f3ba3b3cae81f |
27-Aug-2014 |
Sol Boucher <solb@google.com> |
am 7c8d6957: Merge "camera2-portability: Fix zoom occasionally not working" into lmp-dev
* commit '7c8d6957b96c75ce11f7373f4ab2451ee4666360':
camera2-portability: Fix zoom occasionally not working
|
| 444909d9aff00d322b5a596e576175bcf1550504 |
27-Aug-2014 |
Sol Boucher <solb@google.com> |
am 984a0864: camera2-portability: Optimize out some camera2 AE precaptures
* commit '984a086412a94ebea1bd9af8cd8bbf4afab38034':
camera2-portability: Optimize out some camera2 AE precaptures
|
| 7c8d6957b96c75ce11f7373f4ab2451ee4666360 |
27-Aug-2014 |
Sol Boucher <solb@google.com> |
Merge "camera2-portability: Fix zoom occasionally not working" into lmp-dev
|
| 80cda8dae801f09c2ce928d0f3feb8a569939fc2 |
27-Aug-2014 |
Sol Boucher <solb@google.com> |
camera2-portability: Fix zoom occasionally not working
Cache the last valid CameraSettings object
The camera2 implementation of CameraProxy#getSettings() now returns the most
recent valid CameraSettings object that was provided to it (or the template if
no valid cached instance is available). This more closely mimics the camera1
implementation's behavior, and resolves issues where the app relies on finding
recent settings there in corner cases.
Bug: 17016658
Change-Id: I057feec3f857428dd210300a05f22cafa9f5ba34
amera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2AgentImpl.java
|
| 984a086412a94ebea1bd9af8cd8bbf4afab38034 |
25-Aug-2014 |
Sol Boucher <solb@google.com> |
camera2-portability: Optimize out some camera2 AE precaptures
If it's already converged and the flash isn't being forced on, there's no need
to force the precapture routine, which would delay our capture significantly.
Also use onCaptureProgressed() instead of onCaptureCompleted() when possible.
Change-Id: I0bb7956498b0070382cd5b39b7ccdc0cc0765913
amera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2AgentImpl.java
amera2/utils/src/com/android/ex/camera2/utils/Camera2RequestSettingsSet.java
amera2/utils/tests/src/com/android/ex/camera2/utils/Camera2UtilsTest.java
|
| 46b332708fc40c84af3c88f677d683e3518ebfe6 |
25-Aug-2014 |
Sol Boucher <solb@google.com> |
am c192e279: am f27e71f9: Merge "camera2-portability: Switch to ratio-based zoom interfaces" into lmp-dev
* commit 'c192e279acae7ce5b75e26c443bd53c33e9c667c':
camera2-portability: Switch to ratio-based zoom interfaces
|
| 3dbb8341cc90af96f5d98c84541a17650e6772cc |
25-Aug-2014 |
Sol Boucher <solb@google.com> |
am bfed64d0: am 336f88ed: Merge "camera2-api: Tag camera2 JPEGs with any provided location" into lmp-dev
* commit 'bfed64d0dc0020ab53ec734ea2547ea71ce0178f':
camera2-api: Tag camera2 JPEGs with any provided location
|
| dbceb21edce9685e9a9992c942e1ee91cdaf2867 |
25-Aug-2014 |
Sol Boucher <solb@google.com> |
am d90959c9: am d6a52ce7: Merge "camera2-api: Work around invalid camera2 API focus modes" into lmp-dev
* commit 'd90959c9fcf4ec6d6f332ab534993913538bfe38':
camera2-api: Work around invalid camera2 API focus modes
|
| bedadb4ceddf952746f37cd46267df49de0ee0a2 |
25-Aug-2014 |
Stephen Hines <srhines@google.com> |
am 18aa7840: resolved conflicts for merge of 1870c071 to lmp-dev-plus-aosp
* commit '18aa7840e17473544a80205367435e9c2e8b7527':
Remove deprecated carousel from frameworks/ex.
|
| c192e279acae7ce5b75e26c443bd53c33e9c667c |
23-Aug-2014 |
Sol Boucher <solb@google.com> |
am f27e71f9: Merge "camera2-portability: Switch to ratio-based zoom interfaces" into lmp-dev
* commit 'f27e71f979e803a3ac00f4057eb909886d957a3e':
camera2-portability: Switch to ratio-based zoom interfaces
|
| bfed64d0dc0020ab53ec734ea2547ea71ce0178f |
23-Aug-2014 |
Sol Boucher <solb@google.com> |
am 336f88ed: Merge "camera2-api: Tag camera2 JPEGs with any provided location" into lmp-dev
* commit '336f88ed91a43eb4d1d67fb805171433676279e3':
camera2-api: Tag camera2 JPEGs with any provided location
|
| d90959c9fcf4ec6d6f332ab534993913538bfe38 |
23-Aug-2014 |
Sol Boucher <solb@google.com> |
am d6a52ce7: Merge "camera2-api: Work around invalid camera2 API focus modes" into lmp-dev
* commit 'd6a52ce7b43f15fc931038133b4fea821e9f3b9f':
camera2-api: Work around invalid camera2 API focus modes
|
| f27e71f979e803a3ac00f4057eb909886d957a3e |
23-Aug-2014 |
Sol Boucher <solb@google.com> |
Merge "camera2-portability: Switch to ratio-based zoom interfaces" into lmp-dev
|
| 336f88ed91a43eb4d1d67fb805171433676279e3 |
23-Aug-2014 |
Sol Boucher <solb@google.com> |
Merge "camera2-api: Tag camera2 JPEGs with any provided location" into lmp-dev
|
| d6a52ce7b43f15fc931038133b4fea821e9f3b9f |
23-Aug-2014 |
Sol Boucher <solb@google.com> |
Merge "camera2-api: Work around invalid camera2 API focus modes" into lmp-dev
|
| 18aa7840e17473544a80205367435e9c2e8b7527 |
23-Aug-2014 |
Stephen Hines <srhines@google.com> |
resolved conflicts for merge of 1870c071 to lmp-dev-plus-aosp
Change-Id: I4daede2c850ef9c58980c9191c2a8b837e427171
|
| d0185cc2f5786571565f01b26e1143ce0099bdc8 |
23-Aug-2014 |
Sol Boucher <solb@google.com> |
camera2-api: Tag camera2 JPEGs with any provided location
Bug: 17027000
Change-Id: I311028b9df4d74268fb415c163f7e6a2d2505dff
amera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2Settings.java
amera2/portability/src/com/android/ex/camera2/portability/CameraSettings.java
|
| f2b5a976bb1c30f83682a996ce9289a973c88784 |
23-Aug-2014 |
Sol Boucher <solb@google.com> |
camera2-api: Work around invalid camera2 API focus modes
The validation routine now changes the focus mode to FIXED if the requested one
is unsupported. This is to work around devices whose templates erroneously
specify unsupported focus modes.
Bug: 17177436
Change-Id: If9b679510e0c232453dd0a77dbdd2e0ec713ac12
amera2/portability/src/com/android/ex/camera2/portability/CameraCapabilities.java
|
| 1870c0718729ef8968b2264c329c0351f6ba5de6 |
23-Aug-2014 |
Stephen Hines <srhines@google.com> |
Merge "Remove deprecated carousel from frameworks/ex."
|
| 542f378db148494ed9cb628245a70bd30ede0615 |
22-Aug-2014 |
Sol Boucher <solb@google.com> |
am 6ca06f3f: Merge "camera2-portability: Play shutter sound for camera2 captures" into lmp-dev
* commit '6ca06f3f9ed8807b37e592790e09041f36a0f284':
camera2-portability: Play shutter sound for camera2 captures
|
| 6ca06f3f9ed8807b37e592790e09041f36a0f284 |
22-Aug-2014 |
Sol Boucher <solb@google.com> |
Merge "camera2-portability: Play shutter sound for camera2 captures" into lmp-dev
|
| aa907a3b6637b4f95dbf572d0cf790a70ba3aeb0 |
22-Aug-2014 |
Sol Boucher <solb@google.com> |
camera2-portability: Play shutter sound for camera2 captures
Bug: 17109582
Change-Id: I73321cdbb2972b2d1e9bc2de93192fbb506347e7
amera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2AgentImpl.java
|
| 98ef964d2bc38ce73a2c0f1bd74b3c1a516c293a |
20-Aug-2014 |
Stephen Hines <srhines@google.com> |
Remove deprecated carousel from frameworks/ex.
Bug: 16031597
Change-Id: Ifa547cdfde19f67a3c85d39c1d50ae317bca5932
(cherry picked from commit 3852987b90d58528cb9b9e11d54db4dd7ad9df0d)
arousel/Android.mk
arousel/java/com/android/ex/carousel/CarouselController.java
arousel/java/com/android/ex/carousel/CarouselRS.java
arousel/java/com/android/ex/carousel/CarouselView.java
arousel/java/com/android/ex/carousel/CarouselViewHelper.java
arousel/java/com/android/ex/carousel/CarouselViewUtilities.java
arousel/java/com/android/ex/carousel/carousel.rs
arousel/test/Android.mk
arousel/test/AndroidManifest.xml
arousel/test/res/anim/zoom_enter.xml
arousel/test/res/anim/zoom_exit.xml
arousel/test/res/drawable/background.png
arousel/test/res/drawable/blank_album.png
arousel/test/res/drawable/border.png
arousel/test/res/drawable/emo_im_angel.png
arousel/test/res/drawable/emo_im_cool.png
arousel/test/res/drawable/emo_im_crying.png
arousel/test/res/drawable/emo_im_foot_in_mouth.png
arousel/test/res/drawable/emo_im_happy.png
arousel/test/res/drawable/emo_im_kissing.png
arousel/test/res/drawable/emo_im_laughing.png
arousel/test/res/drawable/emo_im_lips_are_sealed.png
arousel/test/res/drawable/emo_im_money_mouth.png
arousel/test/res/drawable/emo_im_sad.png
arousel/test/res/drawable/emo_im_surprised.png
arousel/test/res/drawable/emo_im_tongue_sticking_out.png
arousel/test/res/drawable/emo_im_undecided.png
arousel/test/res/drawable/emo_im_winking.png
arousel/test/res/drawable/emo_im_wtf.png
arousel/test/res/drawable/emo_im_yelling.png
arousel/test/res/drawable/glossy_overlay.png
arousel/test/res/drawable/specularmap.png
arousel/test/res/drawable/unknown.png
arousel/test/res/drawable/wait.png
arousel/test/res/layout/carousel_test.xml
arousel/test/res/layout/music_demo.xml
arousel/test/res/layout/taskswitcher.xml
arousel/test/res/raw/book.a3d
arousel/test/res/values-af/strings.xml
arousel/test/res/values-am/strings.xml
arousel/test/res/values-ar/strings.xml
arousel/test/res/values-be/strings.xml
arousel/test/res/values-bg/strings.xml
arousel/test/res/values-ca/strings.xml
arousel/test/res/values-cs/strings.xml
arousel/test/res/values-da/strings.xml
arousel/test/res/values-de/strings.xml
arousel/test/res/values-el/strings.xml
arousel/test/res/values-en-rGB/strings.xml
arousel/test/res/values-es-rUS/strings.xml
arousel/test/res/values-es/strings.xml
arousel/test/res/values-et/strings.xml
arousel/test/res/values-fa/strings.xml
arousel/test/res/values-fi/strings.xml
arousel/test/res/values-fr/strings.xml
arousel/test/res/values-hi/strings.xml
arousel/test/res/values-hr/strings.xml
arousel/test/res/values-hu/strings.xml
arousel/test/res/values-in/strings.xml
arousel/test/res/values-it/strings.xml
arousel/test/res/values-iw/strings.xml
arousel/test/res/values-ja/strings.xml
arousel/test/res/values-ko/strings.xml
arousel/test/res/values-lt/strings.xml
arousel/test/res/values-lv/strings.xml
arousel/test/res/values-ms/strings.xml
arousel/test/res/values-nb/strings.xml
arousel/test/res/values-nl/strings.xml
arousel/test/res/values-pl/strings.xml
arousel/test/res/values-pt-rPT/strings.xml
arousel/test/res/values-pt/strings.xml
arousel/test/res/values-ro/strings.xml
arousel/test/res/values-ru/strings.xml
arousel/test/res/values-sk/strings.xml
arousel/test/res/values-sl/strings.xml
arousel/test/res/values-sr/strings.xml
arousel/test/res/values-sv/strings.xml
arousel/test/res/values-sw/strings.xml
arousel/test/res/values-th/strings.xml
arousel/test/res/values-tl/strings.xml
arousel/test/res/values-tr/strings.xml
arousel/test/res/values-uk/strings.xml
arousel/test/res/values-vi/strings.xml
arousel/test/res/values-zh-rCN/strings.xml
arousel/test/res/values-zh-rTW/strings.xml
arousel/test/res/values-zu/strings.xml
arousel/test/res/values/strings.xml
arousel/test/src/com/android/carouseltest/CarouselTestActivity.java
arousel/test/src/com/android/carouseltest/MusicDemoActivity.java
arousel/test/src/com/android/carouseltest/MyCarouselView.java
arousel/test/src/com/android/carouseltest/TaskSwitcherActivity.java
|
| 9d8668449376fa47bc6528c7a61b04d6a0f691b3 |
20-Aug-2014 |
Sol Boucher <solb@google.com> |
camera2-portability: Switch to ratio-based zoom interfaces
This eliminates the deprecated index-based CameraSettings zoom methods in favor
of floating-point ratio based versions, and includes the plumbing to make those
work for both the camera1 and camera2 underlying framework APIs.
Bug: 17016658
Change-Id: I0567a53cd57bfa6d53604e3c5457a39ef49e3cb4
amera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2Capabilities.java
amera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2Settings.java
amera2/portability/src/com/android/ex/camera2/portability/AndroidCameraAgentImpl.java
amera2/portability/src/com/android/ex/camera2/portability/AndroidCameraCapabilities.java
amera2/portability/src/com/android/ex/camera2/portability/AndroidCameraSettings.java
amera2/portability/src/com/android/ex/camera2/portability/CameraAgent.java
amera2/portability/src/com/android/ex/camera2/portability/CameraCapabilities.java
amera2/portability/src/com/android/ex/camera2/portability/CameraSettings.java
amera2/portability/tests/src/com/android/ex/camera2/portability/Camera2PortabilityTest.java
amera2/utils/tests/src/com/android/ex/camera2/utils/Camera2UtilsTest.java
|
| ccc4156099282d6cfefa947a52b9b27bcdb66eac |
22-Aug-2014 |
Stephen Hines <srhines@google.com> |
am 8aa57d57: Merge "Remove deprecated carousel from frameworks/ex." into lmp-dev
* commit '8aa57d57fb5c153aa317f46c0d5e44365ebbef80':
Remove deprecated carousel from frameworks/ex.
|
| 8aa57d57fb5c153aa317f46c0d5e44365ebbef80 |
21-Aug-2014 |
Stephen Hines <srhines@google.com> |
Merge "Remove deprecated carousel from frameworks/ex." into lmp-dev
|
| 3852987b90d58528cb9b9e11d54db4dd7ad9df0d |
20-Aug-2014 |
Stephen Hines <srhines@google.com> |
Remove deprecated carousel from frameworks/ex.
Bug: 16031597
Change-Id: Ifa547cdfde19f67a3c85d39c1d50ae317bca5932
arousel/Android.mk
arousel/java/com/android/ex/carousel/CarouselController.java
arousel/java/com/android/ex/carousel/CarouselRS.java
arousel/java/com/android/ex/carousel/CarouselView.java
arousel/java/com/android/ex/carousel/CarouselViewHelper.java
arousel/java/com/android/ex/carousel/CarouselViewUtilities.java
arousel/java/com/android/ex/carousel/carousel.rs
arousel/test/Android.mk
arousel/test/AndroidManifest.xml
arousel/test/res/anim/zoom_enter.xml
arousel/test/res/anim/zoom_exit.xml
arousel/test/res/drawable/background.png
arousel/test/res/drawable/blank_album.png
arousel/test/res/drawable/border.png
arousel/test/res/drawable/emo_im_angel.png
arousel/test/res/drawable/emo_im_cool.png
arousel/test/res/drawable/emo_im_crying.png
arousel/test/res/drawable/emo_im_foot_in_mouth.png
arousel/test/res/drawable/emo_im_happy.png
arousel/test/res/drawable/emo_im_kissing.png
arousel/test/res/drawable/emo_im_laughing.png
arousel/test/res/drawable/emo_im_lips_are_sealed.png
arousel/test/res/drawable/emo_im_money_mouth.png
arousel/test/res/drawable/emo_im_sad.png
arousel/test/res/drawable/emo_im_surprised.png
arousel/test/res/drawable/emo_im_tongue_sticking_out.png
arousel/test/res/drawable/emo_im_undecided.png
arousel/test/res/drawable/emo_im_winking.png
arousel/test/res/drawable/emo_im_wtf.png
arousel/test/res/drawable/emo_im_yelling.png
arousel/test/res/drawable/glossy_overlay.png
arousel/test/res/drawable/specularmap.png
arousel/test/res/drawable/unknown.png
arousel/test/res/drawable/wait.png
arousel/test/res/layout/carousel_test.xml
arousel/test/res/layout/music_demo.xml
arousel/test/res/layout/taskswitcher.xml
arousel/test/res/raw/book.a3d
arousel/test/res/values-af/strings.xml
arousel/test/res/values-am/strings.xml
arousel/test/res/values-ar/strings.xml
arousel/test/res/values-az-rAZ/strings.xml
arousel/test/res/values-bg/strings.xml
arousel/test/res/values-bn-rBD/strings.xml
arousel/test/res/values-ca/strings.xml
arousel/test/res/values-cs/strings.xml
arousel/test/res/values-da/strings.xml
arousel/test/res/values-de/strings.xml
arousel/test/res/values-el/strings.xml
arousel/test/res/values-en-rGB/strings.xml
arousel/test/res/values-en-rIN/strings.xml
arousel/test/res/values-es-rUS/strings.xml
arousel/test/res/values-es/strings.xml
arousel/test/res/values-et-rEE/strings.xml
arousel/test/res/values-eu-rES/strings.xml
arousel/test/res/values-fa/strings.xml
arousel/test/res/values-fi/strings.xml
arousel/test/res/values-fr-rCA/strings.xml
arousel/test/res/values-fr/strings.xml
arousel/test/res/values-gl-rES/strings.xml
arousel/test/res/values-hi/strings.xml
arousel/test/res/values-hr/strings.xml
arousel/test/res/values-hu/strings.xml
arousel/test/res/values-hy-rAM/strings.xml
arousel/test/res/values-in/strings.xml
arousel/test/res/values-is-rIS/strings.xml
arousel/test/res/values-it/strings.xml
arousel/test/res/values-iw/strings.xml
arousel/test/res/values-ja/strings.xml
arousel/test/res/values-ka-rGE/strings.xml
arousel/test/res/values-kk-rKZ/strings.xml
arousel/test/res/values-km-rKH/strings.xml
arousel/test/res/values-kn-rIN/strings.xml
arousel/test/res/values-ko/strings.xml
arousel/test/res/values-ky-rKG/strings.xml
arousel/test/res/values-lo-rLA/strings.xml
arousel/test/res/values-lt/strings.xml
arousel/test/res/values-lv/strings.xml
arousel/test/res/values-mk-rMK/strings.xml
arousel/test/res/values-ml-rIN/strings.xml
arousel/test/res/values-mn-rMN/strings.xml
arousel/test/res/values-mr-rIN/strings.xml
arousel/test/res/values-ms-rMY/strings.xml
arousel/test/res/values-my-rMM/strings.xml
arousel/test/res/values-nb/strings.xml
arousel/test/res/values-ne-rNP/strings.xml
arousel/test/res/values-nl/strings.xml
arousel/test/res/values-pl/strings.xml
arousel/test/res/values-pt-rPT/strings.xml
arousel/test/res/values-pt/strings.xml
arousel/test/res/values-ro/strings.xml
arousel/test/res/values-ru/strings.xml
arousel/test/res/values-si-rLK/strings.xml
arousel/test/res/values-sk/strings.xml
arousel/test/res/values-sl/strings.xml
arousel/test/res/values-sr/strings.xml
arousel/test/res/values-sv/strings.xml
arousel/test/res/values-sw/strings.xml
arousel/test/res/values-ta-rIN/strings.xml
arousel/test/res/values-te-rIN/strings.xml
arousel/test/res/values-th/strings.xml
arousel/test/res/values-tl/strings.xml
arousel/test/res/values-tr/strings.xml
arousel/test/res/values-uk/strings.xml
arousel/test/res/values-ur-rPK/strings.xml
arousel/test/res/values-uz-rUZ/strings.xml
arousel/test/res/values-vi/strings.xml
arousel/test/res/values-zh-rCN/strings.xml
arousel/test/res/values-zh-rHK/strings.xml
arousel/test/res/values-zh-rTW/strings.xml
arousel/test/res/values-zu/strings.xml
arousel/test/res/values/strings.xml
arousel/test/src/com/android/carouseltest/CarouselTestActivity.java
arousel/test/src/com/android/carouseltest/MusicDemoActivity.java
arousel/test/src/com/android/carouseltest/MyCarouselView.java
arousel/test/src/com/android/carouseltest/TaskSwitcherActivity.java
|
| e4094bd3b85ce20e81a1677319192ed2274d0525 |
20-Aug-2014 |
Alan Newberger <alann@google.com> |
Log null returns from Camera.getParameters
There is some evidence that we may be getting null parameters on N10.
Specfically, AndroidCameraProxyImpl.getParameters is returning null,
and from analysis the only two options are that the API1 returns null,
or our synchronous waiting for threads is compromised and we are returning
without error too fast. The latter would presumably show up on many
devices, but we are only seeing an issue on N10, so I suspect an API/HAL
issue. Adding logging and a thrown exception, and cleaning up
GET_PARAMETERS message creation slightly to make more consistent with
other invocations.
Bug: 17109801
Change-Id: I1705345d03ed16ef22b170a11fcaf0c6fb2a2c4d
amera2/portability/src/com/android/ex/camera2/portability/AndroidCameraAgentImpl.java
|
| 961ab3f741ce1d199e4327256278fc94a328dbea |
18-Aug-2014 |
Alan Newberger <alann@google.com> |
am 489e29ec: Merge "Add exception logging to CameraDeviceInfo retrieval failure" into lmp-dev
* commit '489e29ecbfd2ffe10ebd199204f3ee242b1bd1f8':
Add exception logging to CameraDeviceInfo retrieval failure
|
| 489e29ecbfd2ffe10ebd199204f3ee242b1bd1f8 |
18-Aug-2014 |
Alan Newberger <alann@google.com> |
Merge "Add exception logging to CameraDeviceInfo retrieval failure" into lmp-dev
|
| eb07f0c4c693566f6f258e84426f518e90513c11 |
16-Aug-2014 |
Alan Newberger <alann@google.com> |
Add exception logging to CameraDeviceInfo retrieval failure
camera1 CameraAgent returns null CameraDeviceInfo if the underlying
camera device is broken. see b/16982203, this caused issues but was
invisible in logs. Adding logging to document true root cause of
any device info failures stemming from an underlying failure.
Bug: 16982203
Change-Id: I8a48714e1ddbde8b8eac35f149136d19efce5fb8
amera2/portability/src/com/android/ex/camera2/portability/AndroidCameraAgentImpl.java
|
| 062b5840b7c10c16c01c9c0285837793e10a166f |
16-Aug-2014 |
Alan Newberger <alann@google.com> |
am d0e873ab: Merge "Consolidate parameter caching in camera1 portability agent" into lmp-dev
* commit 'd0e873ab838702c69ddbe4ca9523949348f3ea47':
Consolidate parameter caching in camera1 portability agent
|
| 8447d2276441983d88e8315ffa79a16a90b3d4bb |
15-Aug-2014 |
Alan Newberger <alann@google.com> |
Consolidate parameter caching in camera1 portability agent
The existing implementation of the AndroidCameraAgentImpl uses
a 'mParamsToSet' upon which is projects requested settings
changes in applySettings(). But, this mParamsToSet is initialized
only upon camera open! So 'hidden' parameters like video-size are
stuck in the value upon open. Instead, they should be current to
the last call to refreshSettings. To simplify, removed this and
another copy of parameters (mParameters), introduced one cache
class, and use it throughout the agent. Tested and app seems to
work OK in general with the change, and specifically confirmed that
video size parameters are not reverted after start, as was
observed before the change.
Bug: 16991558
Change-Id: I8f2749b8ab2ccc2cb858b8cd844330c5a482f79c
amera2/portability/src/com/android/ex/camera2/portability/AndroidCameraAgentImpl.java
|
| 36c9a1f96c2db620e291a99c573e106b65974728 |
16-Aug-2014 |
Sol Boucher <solb@google.com> |
am 182acbc3: Merge "camera2-portability: Provide preview transformation matrix" into lmp-dev
* commit '182acbc3f78ea6c6edd6bd5d67c62188b4079243':
camera2-portability: Provide preview transformation matrix
|
| 2c3a6776745e6ab81f8eb8f79e477f976f32adc2 |
16-Aug-2014 |
Sol Boucher <solb@google.com> |
am b2df32dd: Merge "camera2-portability: Make factory offer choice of backing API" into lmp-dev
* commit 'b2df32dd892ae8076714b7ebd33c715378c4c730':
camera2-portability: Make factory offer choice of backing API
|
| c3de654abf3c693391137b9723a0feb27ce0bc6d |
16-Aug-2014 |
Nancy Chen <nancychen@google.com> |
am fa88947e: Merge "Add public method to check if the partition is empty." into lmp-dev
* commit 'fa88947e17223d1e52eb8bfbac2f1cab7f2e56ba':
Add public method to check if the partition is empty.
|
| ee4dc71e3162f049fe4681451bf67e2888999739 |
15-Aug-2014 |
Sol Boucher <solb@google.com> |
am 3d6e5018: Merge "camera2-portability: Improve capability conversions\' null-safety" into lmp-dev
* commit '3d6e5018ff8d64ac1815477fe0172f62f91727a2':
camera2-portability: Improve capability conversions' null-safety
|
| fa88947e17223d1e52eb8bfbac2f1cab7f2e56ba |
16-Aug-2014 |
Nancy Chen <nancychen@google.com> |
Merge "Add public method to check if the partition is empty." into lmp-dev
|
| e93a23581cbb9da2282b5897ffc167f86836afae |
15-Aug-2014 |
Nancy Chen <nancychen@google.com> |
Add public method to check if the partition is empty.
Currently the size of the partition is hidden from public. The isEmpty
method will allow outside classes to check if the partition does not
have any entries in it.
Bug: 15596340
Change-Id: I0a0f8f7c7a350b802e58e9138801c13b6e74a059
ommon/java/com/android/common/widget/CompositeCursorAdapter.java
|
| d0e873ab838702c69ddbe4ca9523949348f3ea47 |
16-Aug-2014 |
Alan Newberger <alann@google.com> |
Merge "Consolidate parameter caching in camera1 portability agent" into lmp-dev
|
| 182acbc3f78ea6c6edd6bd5d67c62188b4079243 |
16-Aug-2014 |
Sol Boucher <solb@google.com> |
Merge "camera2-portability: Provide preview transformation matrix" into lmp-dev
|
| f9feab9a826e5b33d811e757bdfdbfa0738fcfa5 |
12-Aug-2014 |
Sol Boucher <solb@google.com> |
camera2-portability: Provide preview transformation matrix
Applying this transform to the Surface on which the stream is displayed results
in a correctly rotated image. For API 1, the rotation is actually performed by
the Camera class and the returned matrix is an identity matrix; however, for API
2, the transformation is responsible for proper orientation.
Bug: 16875535
Change-Id: I044ffbd1095bd1a9792c899b792129cc94c7c916
amera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2AgentImpl.java
amera2/portability/src/com/android/ex/camera2/portability/CameraDeviceInfo.java
|
| b2df32dd892ae8076714b7ebd33c715378c4c730 |
16-Aug-2014 |
Sol Boucher <solb@google.com> |
Merge "camera2-portability: Make factory offer choice of backing API" into lmp-dev
|
| 50f5b019ba3f333a09a1beb9667fd7290082dc31 |
05-Aug-2014 |
Sol Boucher <solb@google.com> |
camera2-portability: Make factory offer choice of backing API
This allows apps using the library to decide whether to jump to the new API.
Users of the library may choose to use the Camera class, the camera2 API, or
have the choice made automatically based on the device's API level. The choice
may also be globally overridden by means of a system property.
Bug: 16875535
Change-Id: I92e4be96fbd04057be61ceb8a0c58935770022f6
amera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2AgentImpl.java
amera2/portability/src/com/android/ex/camera2/portability/AndroidCameraAgentImpl.java
amera2/portability/src/com/android/ex/camera2/portability/CameraAgentFactory.java
amera2/portability/src/com/android/ex/camera2/portability/util/SystemProperties.java
|
| 3d6e5018ff8d64ac1815477fe0172f62f91727a2 |
15-Aug-2014 |
Sol Boucher <solb@google.com> |
Merge "camera2-portability: Improve capability conversions' null-safety" into lmp-dev
|
| 5d5574310346e7b54effba5192d8c66963b0165b |
14-Aug-2014 |
Sol Boucher <solb@google.com> |
am c6344fae: camera2-portability: Report correct sizes for preview and capture
* commit 'c6344faeff899655abd60b3bf4cd638e58bcc3d7':
camera2-portability: Report correct sizes for preview and capture
|
| bc9c0e2cb071b085ecc5646751fb59f5145d51b1 |
13-Aug-2014 |
Sol Boucher <solb@google.com> |
camera2-portability: Improve capability conversions' null-safety
This makes it harder for unexpected nulls in CaptureRequest templates to cause
exceptions while unboxing Integer wrappers. Such crashes were observed on some
devices while running on the legacy layer, especially with scene modes.
Change-Id: I0cae95534f138e97f2c589d15e81f77b4f2141f7
amera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2Settings.java
|
| c6344faeff899655abd60b3bf4cd638e58bcc3d7 |
13-Aug-2014 |
Sol Boucher <solb@google.com> |
camera2-portability: Report correct sizes for preview and capture
This reports JPEG capture sizes instead of YUV ones, and ensures that preview
sizes match TextureView, not SurfaceView.
Change-Id: I2963ee1741156cc2a29e2e65308bd14dd145e4c8
amera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2Capabilities.java
|
| ba18fb8929fdbcd1e6f9470c6b77ee985d194268 |
08-Aug-2014 |
Alan Newberger <alann@google.com> |
am 47497bee: Merge "Fix missing zoom fields in copy constructor of CameraCapabilities" into lmp-dev
* commit '47497bee8a3550af79f9a32c9362d7ee78364a71':
Fix missing zoom fields in copy constructor of CameraCapabilities
|
| f0a74a03f7a3526bad17df7c9ff6d5b959dec050 |
08-Aug-2014 |
Sol Boucher <solb@google.com> |
am 399c8277: Merge "camera2-portability: Support photo capture using camera2 API" into lmp-dev
* commit '399c82779ad59de44f46c25fd031f9909e0581e9':
camera2-portability: Support photo capture using camera2 API
|
| 47497bee8a3550af79f9a32c9362d7ee78364a71 |
08-Aug-2014 |
Alan Newberger <alann@google.com> |
Merge "Fix missing zoom fields in copy constructor of CameraCapabilities" into lmp-dev
|
| 4ecb0ad6d1d5dc6b12f998bf694877df06a77890 |
08-Aug-2014 |
Alan Newberger <alann@google.com> |
Fix missing zoom fields in copy constructor of CameraCapabilities
These fields are deprecated but while we have them, should copy them in the
constructor. This contributes to a zoom bug in the app, since ratios and indices
are dropped upon copy.
Bug: 16527845
Change-Id: I008384faa77e0c13a2790e095fa311909c1e9b44
amera2/portability/src/com/android/ex/camera2/portability/CameraCapabilities.java
|
| 399c82779ad59de44f46c25fd031f9909e0581e9 |
08-Aug-2014 |
Sol Boucher <solb@google.com> |
Merge "camera2-portability: Support photo capture using camera2 API" into lmp-dev
|
| de48004068f8c16f9a56c60b0ed2485a67687b4b |
23-Jul-2014 |
Sol Boucher <solb@google.com> |
camera2-portability: Support photo capture using camera2 API
This implements JPEG capture, including an autoexposure precapture sequence.
There are many changes to AndroidCamera2Capabilities and AndroidCamera2Settings
to support the representation of modes (e.g. flash modes) whose flags do not
map trivially between the API implementations. Part of this work is the
conversion of AndroidCamera2AgentImpl to use and store a
Camera2RequestSettingsSet instead of a bare API 2 CaptureRequest.Builder.
Change-Id: I03f9f98c954a7b0c140ac8d80161878c92ef65d2
amera2/portability/portability.mk
amera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2AgentImpl.java
amera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2Capabilities.java
amera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2Settings.java
amera2/portability/src/com/android/ex/camera2/portability/AndroidCameraAgentImpl.java
amera2/portability/src/com/android/ex/camera2/portability/AndroidCameraSettings.java
amera2/portability/src/com/android/ex/camera2/portability/CameraAgent.java
amera2/portability/src/com/android/ex/camera2/portability/CameraCapabilities.java
amera2/portability/src/com/android/ex/camera2/portability/CameraDeviceInfo.java
amera2/portability/src/com/android/ex/camera2/portability/CameraSettings.java
amera2/portability/tests/Android.mk
amera2/portability/tests/AndroidManifest.xml
amera2/portability/tests/src/com/android/ex/camera2/portability/Camera2PortabilityTest.java
amera2/utils/tests/src/com/android/ex/camera2/utils/Camera2DeviceTester.java
amera2/utils/tests/src/com/android/ex/camera2/utils/Camera2UtilsTest.java
|
| 2f9250e7116e2111036a86007dab4e9e59a53987 |
07-Aug-2014 |
Eino-Ville Talvala <etalvala@google.com> |
am 91a9eebe: Camera2: Remove hidden callbacks
* commit '91a9eebe63a2481ed6adbc59ecfbb22ce41fc65e':
Camera2: Remove hidden callbacks
|
| 91a9eebe63a2481ed6adbc59ecfbb22ce41fc65e |
31-Jul-2014 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Remove hidden callbacks
Change-Id: I4038f0aff5e82531ca2b6231feee9ade36ddbb75
amera2/public/src/com/android/ex/camera2/blocking/BlockingCameraManager.java
amera2/public/src/com/android/ex/camera2/blocking/BlockingStateListener.java
|
| b4a7338b38dc0bfca08b5c4cd738c3cb0c89b7b9 |
31-Jul-2014 |
Sol Boucher <solb@google.com> |
am d4e5286b: Merge "Create new com.android.ex.camera2.utils package" into lmp-dev
* commit 'd4e5286bb4145e0371b783158fc8411565429c9b':
Create new com.android.ex.camera2.utils package
|
| 904adf1f24e0bcd349f19dad5c2c05d0c5f18b18 |
31-Jul-2014 |
Alan Newberger <alann@google.com> |
am 15773a64: add TORCH support to camera1 portability library
* commit '15773a64b42023e31e2aade23ae44273862a9c04':
add TORCH support to camera1 portability library
|
| 15773a64b42023e31e2aade23ae44273862a9c04 |
31-Jul-2014 |
Alan Newberger <alann@google.com> |
add TORCH support to camera1 portability library
In the move to the portability library, TORCH mode got dropped.
Bug: 16680156
Change-Id: I3878c2399246bdb5cc80311c49533971c0c4c3d2
amera2/portability/src/com/android/ex/camera2/portability/AndroidCameraCapabilities.java
|
| d4e5286bb4145e0371b783158fc8411565429c9b |
31-Jul-2014 |
Sol Boucher <solb@google.com> |
Merge "Create new com.android.ex.camera2.utils package" into lmp-dev
|
| 8ba391e3f88936557ad6d44bbef32cb08f4ca310 |
24-Jul-2014 |
Sol Boucher <solb@google.com> |
Create new com.android.ex.camera2.utils package
It contains:
- Camera2RequestSettingsSet class for storing/unioning CaptureRequest.Builders
- A Camera2CaptureListenerSplitter class for connecting multiple such listeners
- A Camera2CpatureListenerForwarder for relaying callbacks to another Handler
Change-Id: I47381e4a45b4232b86e5498a1cc39cc600b5c5c5
amera2/utils/Android.mk
amera2/utils/src/com/android/ex/camera2/utils/Camera2CaptureListenerForwarder.java
amera2/utils/src/com/android/ex/camera2/utils/Camera2CaptureListenerSplitter.java
amera2/utils/src/com/android/ex/camera2/utils/Camera2RequestSettingsSet.java
amera2/utils/tests/Android.mk
amera2/utils/tests/AndroidManifest.xml
amera2/utils/tests/src/com/android/ex/camera2/utils/Camera2UtilsTest.java
amera2/utils/utils.mk
|
| 2a98ac7290f91ac2b1e33dd06fe9610c36ab3b87 |
26-Jul-2014 |
Ruben Brunk <rubenbrunk@google.com> |
am 9b5facd0: camera2: Add BlockingCaptureListener class.
* commit '9b5facd03adbb55f6a1faa49788308f763a54ff0':
camera2: Add BlockingCaptureListener class.
|
| 9b5facd03adbb55f6a1faa49788308f763a54ff0 |
25-Jul-2014 |
Ruben Brunk <rubenbrunk@google.com> |
camera2: Add BlockingCaptureListener class.
Bug: 15116722
Change-Id: Ib843dea27175dece8857359707318323a57f5409
amera2/public/src/com/android/ex/camera2/blocking/BlockingCaptureListener.java
amera2/public/src/com/android/ex/camera2/blocking/BlockingSessionListener.java
|
| ccb2d741d65efcc6edb9d138d7b6ab9122c76a76 |
25-Jul-2014 |
Sol Boucher <solb@google.com> |
am 90aa7e81: Merge "camera2-portability: Add focus locks and touch-to-focus for API 2" into lmp-dev
* commit '90aa7e817d1969b4fbbfc36dbeca6c500b6aaa0b':
camera2-portability: Add focus locks and touch-to-focus for API 2
|
| 90aa7e817d1969b4fbbfc36dbeca6c500b6aaa0b |
25-Jul-2014 |
Sol Boucher <solb@google.com> |
Merge "camera2-portability: Add focus locks and touch-to-focus for API 2" into lmp-dev
|
| a97b7d1192e246a5f738991adca37cce282e1382 |
09-Jul-2014 |
Sol Boucher <solb@google.com> |
camera2-portability: Add focus locks and touch-to-focus for API 2
This implements focus locks very simply using only camera2 API requests: the
lens is locked on autoFocus() and unlocked on cancelAutoFocus(), as with the
existing legacy API--backed implementation. Both passive and active focus modes
ares supported, with and without positional focusing.
Change-Id: I26b1866539807fd3d64189923871443056a166af
amera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2AgentImpl.java
amera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2Capabilities.java
|
| 8eb8a70d0f4c42d04ab79820cf272cce77b7a5e4 |
21-Jul-2014 |
Justin Klaassen <justinklaassen@google.com> |
am af775144: am 73513fb9: am b50ab0c2: am 3fbecf11: Update build.gradle from master
* commit 'af7751445f1e8f07501775939fb98163d79e911c':
Update build.gradle from master
|
| af7751445f1e8f07501775939fb98163d79e911c |
21-Jul-2014 |
Justin Klaassen <justinklaassen@google.com> |
am 73513fb9: am b50ab0c2: am 3fbecf11: Update build.gradle from master
* commit '73513fb9babbf8efbff930cb4cc81acdb1f1fdf3':
Update build.gradle from master
|
| 73513fb9babbf8efbff930cb4cc81acdb1f1fdf3 |
21-Jul-2014 |
Justin Klaassen <justinklaassen@google.com> |
am b50ab0c2: am 3fbecf11: Update build.gradle from master
* commit 'b50ab0c2167956317e7fc2358e87320991418cf5':
Update build.gradle from master
|
| b50ab0c2167956317e7fc2358e87320991418cf5 |
21-Jul-2014 |
Justin Klaassen <justinklaassen@google.com> |
am 3fbecf11: Update build.gradle from master
* commit '3fbecf118b05748b5e9f6feae596c30eca64ccc9':
Update build.gradle from master
|
| c92a662e1e3cc94cc890614017c80849716be084 |
21-Jul-2014 |
Baligh Uddin <baligh@google.com> |
am 0728274f: (-s ours) Remove deprecated locales - DO NOT MERGE
* commit '0728274f9a4d218c1757794a307e80a64b87fb1d':
Remove deprecated locales - DO NOT MERGE
|
| 0728274f9a4d218c1757794a307e80a64b87fb1d |
19-Jul-2014 |
Baligh Uddin <baligh@google.com> |
Remove deprecated locales - DO NOT MERGE
Change-Id: Id1e3730d897e9f7e8f416fdae0d1da106a63097c
arousel/test/res/values-az/strings.xml
arousel/test/res/values-bn-rWB/strings.xml
arousel/test/res/values-eu-rPV/strings.xml
arousel/test/res/values-gl-rGA/strings.xml
arousel/test/res/values-kn-rKA/strings.xml
arousel/test/res/values-ml-rKL/strings.xml
arousel/test/res/values-mr-rMH/strings.xml
arousel/test/res/values-ne/strings.xml
arousel/test/res/values-si/strings.xml
arousel/test/res/values-ta-rTN/strings.xml
arousel/test/res/values-te-rAP/strings.xml
|
| 16c4aa2da25b20d122034220455d8a5aa09d76b0 |
18-Jul-2014 |
Baligh Uddin <baligh@google.com> |
Remove deprecated locales
Change-Id: I282a5e3386eedb37a5b2dca8994b1c0ebb79e9f4
arousel/test/res/values-az/strings.xml
arousel/test/res/values-ne/strings.xml
arousel/test/res/values-si/strings.xml
|
| 3fbecf118b05748b5e9f6feae596c30eca64ccc9 |
18-Jul-2014 |
Justin Klaassen <justinklaassen@google.com> |
Update build.gradle from master
Change-Id: I858554625d69dbc34f7174a5c8526d602113b569
ommon/build.gradle
|
| cd7710b5792841d460421d9b3d547535b1d82650 |
18-Jul-2014 |
Baligh Uddin <baligh@google.com> |
Remove deprecated locales
Change-Id: I18c2685bd074e768b891233ab28b475e565ad925
arousel/test/res/values-bn-rWB/strings.xml
arousel/test/res/values-eu-rPV/strings.xml
arousel/test/res/values-gl-rGA/strings.xml
arousel/test/res/values-kn-rKA/strings.xml
arousel/test/res/values-ml-rKL/strings.xml
arousel/test/res/values-mr-rMH/strings.xml
arousel/test/res/values-ta-rTN/strings.xml
arousel/test/res/values-te-rAP/strings.xml
|
| 82063341f0e36419b6214403f40613aa18f76c8a |
17-Jul-2014 |
Sol Boucher <solb@google.com> |
am 7e0d39bf: (-s ours) DO NOT MERGE: Fix oversight while refactoring CameraStateHolder
* commit '7e0d39bf7b6e0f0df606e3f6c15f673f70fed3f7':
DO NOT MERGE: Fix oversight while refactoring CameraStateHolder
|
| 7e0d39bf7b6e0f0df606e3f6c15f673f70fed3f7 |
16-Jul-2014 |
Sol Boucher <solb@google.com> |
DO NOT MERGE: Fix oversight while refactoring CameraStateHolder
The base class still (redundantly) defined states, and AndroidCameraStateMachine
was overriding methods with a verbatim copy of their implementations.
Change-Id: I0e6361417edb159f91b89409058ee9a73b1101d9
(cherry-picked from commit dbc457417c581c21b5d49539325b1b152dc1baba)
amera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2AgentImpl.java
amera2/portability/src/com/android/ex/camera2/portability/AndroidCameraAgentImpl.java
amera2/portability/src/com/android/ex/camera2/portability/CameraStateHolder.java
|
| dbc457417c581c21b5d49539325b1b152dc1baba |
16-Jul-2014 |
Sol Boucher <solb@google.com> |
Fix oversight while refactoring CameraStateHolder
The base class still (redundantly) defined states, and AndroidCameraStateMachine
was overriding methods with a verbatim copy of their implementations.
Change-Id: I0e6361417edb159f91b89409058ee9a73b1101d9
amera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2AgentImpl.java
amera2/portability/src/com/android/ex/camera2/portability/AndroidCameraAgentImpl.java
amera2/portability/src/com/android/ex/camera2/portability/CameraStateHolder.java
|
| a0842b40441db5332a5290f941021636b1182761 |
09-Jun-2014 |
Sol Boucher <solb@google.com> |
camera2-portability: Add support for previews using the camera2 API
At the moment, only SurfaceTextures (and not SurfaceViews/SurfaceHolders) are
supported. The tests still only cover Stringifier and IntegralStringifier.
Change-Id: Ie643c58f8383cd3b9f59c16e0b79239df0ca068d
amera2/portability/Android.mk
amera2/portability/portability.mk
amera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2AgentImpl.java
amera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2Capabilities.java
amera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2Settings.java
amera2/portability/src/com/android/ex/camera2/portability/AndroidCameraAgentImpl.java
amera2/portability/src/com/android/ex/camera2/portability/AndroidCameraCapabilities.java
amera2/portability/src/com/android/ex/camera2/portability/CameraAgent.java
amera2/portability/src/com/android/ex/camera2/portability/CameraAgentFactory.java
amera2/portability/src/com/android/ex/camera2/portability/CameraCapabilities.java
amera2/portability/src/com/android/ex/camera2/portability/CameraCapabilitiesFactory.java
amera2/portability/src/com/android/ex/camera2/portability/CameraSettings.java
amera2/portability/src/com/android/ex/camera2/portability/CameraStateHolder.java
amera2/portability/src/com/android/ex/camera2/portability/DispatchThread.java
amera2/portability/src/com/android/ex/camera2/portability/Size.java
amera2/portability/tests/Android.mk
amera2/portability/tests/AndroidManifest.xml
amera2/portability/tests/src/com/android/ex/camera2/portability/Camera2PortabilityTest.java
|
| 858edec400cf5c7cf3171f877f81bbc891fc4bcc |
06-Jul-2014 |
Baligh Uddin <baligh@google.com> |
am 366ddf74: (-s ours) am 6f3df8c8: (-s ours) am 0df20a5f: (-s ours) am 2d25a637: (-s ours) Import translations. DO NOT MERGE
* commit '366ddf74b427109ff2470aa468da2fe5bf1ab5d1':
Import translations. DO NOT MERGE
|
| 3f76500d39d1cd08f3cd2e1379c7f61597978fe0 |
06-Jul-2014 |
Baligh Uddin <baligh@google.com> |
am 000bd252: (-s ours) keep history after reset to a03388cf9a9bcd78400b6f79aa360a5d1e71c7ac
* commit '000bd2527105f0bdf825a65cbf82a1133d1e0bae':
Import translations. DO NOT MERGE
|
| 366ddf74b427109ff2470aa468da2fe5bf1ab5d1 |
06-Jul-2014 |
Baligh Uddin <baligh@google.com> |
am 6f3df8c8: (-s ours) am 0df20a5f: (-s ours) am 2d25a637: (-s ours) Import translations. DO NOT MERGE
* commit '6f3df8c87787838cb66eb092480e3a5e216955d1':
Import translations. DO NOT MERGE
|
| 6f3df8c87787838cb66eb092480e3a5e216955d1 |
06-Jul-2014 |
Baligh Uddin <baligh@google.com> |
am 0df20a5f: (-s ours) am 2d25a637: (-s ours) Import translations. DO NOT MERGE
* commit '0df20a5fc1919af07f8aadd5e1b4f290b2bfa8d4':
Import translations. DO NOT MERGE
|
| 0df20a5fc1919af07f8aadd5e1b4f290b2bfa8d4 |
06-Jul-2014 |
Baligh Uddin <baligh@google.com> |
am 2d25a637: (-s ours) Import translations. DO NOT MERGE
* commit '2d25a6375973c5f49eccfa4228bd3eb6620709b1':
Import translations. DO NOT MERGE
|
| 2f39b333a32f9849bf174e3ea8b3d552e11e372c |
05-Jul-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: Iadc3979ff2a08d485d92a12ff29472f3cd447743
Auto-generated-cl: translation import
arousel/test/res/values-bn-rBD/strings.xml
arousel/test/res/values-eu-rES/strings.xml
arousel/test/res/values-gl-rES/strings.xml
arousel/test/res/values-kn-rIN/strings.xml
arousel/test/res/values-ml-rIN/strings.xml
arousel/test/res/values-mr-rIN/strings.xml
arousel/test/res/values-ta-rIN/strings.xml
arousel/test/res/values-te-rIN/strings.xml
|
| 2d25a6375973c5f49eccfa4228bd3eb6620709b1 |
05-Jul-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: I8c32827422ba30ceda810833b72261ef4b3f164b
Auto-generated-cl: translation import
hips/res/values-sr/strings.xml
|
| e81ed91f2dfe5a2c4d10830d69918588ffc98d2b |
30-Jun-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: Ie463803531bd671303f0dbafe61b635c5c447bff
Auto-generated-cl: translation import
arousel/test/res/values-bn-rWB/strings.xml
arousel/test/res/values-eu-rPV/strings.xml
arousel/test/res/values-gl-rGA/strings.xml
arousel/test/res/values-is-rIS/strings.xml
arousel/test/res/values-kk-rKZ/strings.xml
arousel/test/res/values-kn-rKA/strings.xml
arousel/test/res/values-ky-rKG/strings.xml
arousel/test/res/values-mk-rMK/strings.xml
arousel/test/res/values-ml-rKL/strings.xml
arousel/test/res/values-mr-rMH/strings.xml
arousel/test/res/values-my-rMM/strings.xml
arousel/test/res/values-ta-rTN/strings.xml
arousel/test/res/values-te-rAP/strings.xml
arousel/test/res/values-ur-rPK/strings.xml
arousel/test/res/values-uz-rUZ/strings.xml
|
| b73b7335d8b1e880b1f49e0279ca231a06b89ba0 |
24-Jun-2014 |
Sol Boucher <solb@google.com> |
Merge "camera2-portability: Remove Camera.CameraInfo accessor"
|
| 000bd2527105f0bdf825a65cbf82a1133d1e0bae |
24-Jun-2014 |
Baligh Uddin <baligh@google.com> |
keep history after reset to a03388cf9a9bcd78400b6f79aa360a5d1e71c7ac
|
| 5bafa7ceeaf79da19177f7928a8682f5ccaea1ce |
23-Jun-2014 |
Scott Kennedy <skennedy@google.com> |
am 74719a2c: am b468c8fc: am 92591524: am e0b5c555: am 49f3ffd3: am 194dda10: Fix some warnings
* commit '74719a2c7548a4780059d1b5e3637c51da4e9013':
|
| 13a36439662ee370438702341c1da96d4d0f45dd |
23-Jun-2014 |
Chris Craik <ccraik@google.com> |
am 34075667: am 2a2ff6ed: Merge "Add Animated WebP support in RasterMill"
* commit '340756673be2875c79d019b13ebb687942eb534f':
|
| 12832770cd0e37c45c0ece095e893cdfb2b0016e |
23-Jun-2014 |
John Reck <jreck@google.com> |
am cc9d3ec8: am bbeed672: Merge "Fix ALOG_ASSERT"
* commit 'cc9d3ec81ce751e1b924d8e659e17df3628f73c5':
|
| e3314b094fda992cfdf504967b539b7c27cabb61 |
23-Jun-2014 |
Tony Mantler <nicoya@google.com> |
am 87e32715: am e5dfefd4: am f28f92f2: am 9fec16d3: am 9d2e3059: am 5d92cc5c: Call super.onAttached/onDetachedFromWindow
* commit '87e32715f91b39aa4a432f07e845d7879207279e':
|
| 448de94ac0bfd8cf3d36939a01c3e17655e9a207 |
23-Jun-2014 |
Igor Murashkin <iam@google.com> |
am d9962b0c: am 6a005419: Merge "camera2: BlockingStateListener invokes proxy before firing state change"
* commit 'd9962b0cedef65c96b74d2981814adfb46ebfff3':
|
| 047d53672d4fcfe5d480a170b6b1518e89c4038d |
23-Jun-2014 |
Jay Shrauner <shrauner@google.com> |
am 2bf26299: (-s ours) am f89f55d9: am c736dbcf: (-s ours) am e4dbcf35: am cf4d2a64: am 38ae6989: (-s ours) am ce2b95ae: Fix AudioEngine to allow re-initialization - DO NOT MERGE
* commit '2bf26299da8f594ea996354044e140cf49a00665':
|
| 5b28547536dedcd58c67a0596fb4337389d2b8d8 |
23-Jun-2014 |
Jay Shrauner <shrauner@google.com> |
am 46d0b7d2: am c5da8557: Merge "Fix AudioEngine to allow re-initialization"
* commit '46d0b7d2b216e2acebd60f0c65d98f6880307c9c':
|
| 2ad62534fa23ff517e697301243cc77bfc1d066a |
23-Jun-2014 |
Mike Schneider <michschn@google.com> |
am f9339af1: am 427a1270: am d06074aa: am 53e46a8c: am ae8431ea: am 79623848: am c842713d: fix visibility
* commit 'f9339af106f5991be4fac80ed969800692259a7f':
|
| 7c5d27f3a5236a58f5b9ec7858bb3e4451cc673f |
23-Jun-2014 |
Andrew Sapperstein <asapperstein@google.com> |
am 979416fa: am 4b868ed8: am 27df5a3a: am 099915f7: am ebf46bcd: am 8eb56a43: am ae908d29: RTL - properly set text alignment and direction.
* commit '979416faa212447a83829e04271263f5e462226a':
|
| 4693e7ccd27753dbd7df3110e1ec87f532147036 |
23-Jun-2014 |
Kevin Lin <linkevin@google.com> |
am 96145798: am 30df46f9: am 8fc3233b: am 3c154ffa: am 3696df98: am 57b5b6fa: am 0c58c370: Fix redrawing chips with recipientEditText onSizeChanged when it has left and right padding.
* commit '961457987d4d994c55aef30775fef9bdb9bf40ae':
|
| eb8f0cfd93a18c1caf6d28ee003c84da9a88ca58 |
23-Jun-2014 |
Kevin Lin <linkevin@google.com> |
am 14321951: am 53e68fc8: am 2c2b17ec: am 15fa87c9: am af559a10: am ab307ee2: am 66df41d9: Fix build with VisibleRecipientChip
* commit '143219518025e983726674d2b52b5cf804f8080c':
|
| cc100a46968e8519a858c83878ac88b7751e088a |
23-Jun-2014 |
Kevin Lin <linkevin@google.com> |
am 6fa46d4a: am 82ef8639: am 07c0fcd1: am 93e48b10: am 0764e983: am 4a0aacfe: am d4ae44ec: Added support to choose vertical alignment for image spans.
* commit '6fa46d4a80bf1524c5656bb0c2d19a3b065be282':
|
| 246506ea3d71f10918b99387f3ae47f2eeded526 |
23-Jun-2014 |
Xavier Ducrohet <xav@google.com> |
am 03491484: am a26b2617: Fix buildDir issue.
* commit '03491484367f61812538fd5f3c294c80cd85cd70':
|
| aa041aa43e4e0f81086fed71db649889269646da |
23-Jun-2014 |
Baligh Uddin <baligh@google.com> |
am 616c2b3e: (-s ours) am ef66d529: (-s ours) am 90b1744d: (-s ours) am 9a823b56: (-s ours) am 255166c7: (-s ours) am 30febb9a: (-s ours) am 64becd80: (-s ours) am e49544de: (-s ours) Import translations. DO NOT MERGE
* commit '616c2b3e3c250b84ecb320341d8b9de81033ec42':
|
| cb48be4d598fa821fbf2dfb7a563ef438225e514 |
23-Jun-2014 |
Scott Kennedy <skennedy@google.com> |
am af181c16: am 623648bd: am 5a32825f: am f4646b4c: am bb001e29: am 5da5d23b: BaseRecipientAdapter does not need to be abstract
* commit 'af181c16de60cf2625919159ea8091184c87cd18':
|
| a4ee3ba2823c80808c2ed8862eb16884f898a705 |
23-Jun-2014 |
Narayan Kamath <narayan@google.com> |
am 88249c61: am 9ea321d1: am 2a573a6a: am 56bab444: Merge "AArch64: Fix GetChannelCount() declaration."
* commit '88249c610225f7ebb1ffe7afd7f95200003ea60c':
|
| 97247aae5c110838edc5bb8dcd8db9440be43ded |
23-Jun-2014 |
Narayan Kamath <narayan@google.com> |
am 346523ac: am 29ec2dc1: am 7a690375: am 9ddd5eeb: Merge "AArch64: Minor JNI type changes"
* commit '346523acb0f1cc4ce2ea1d9e1335d24407ec25e0':
|
| b6f8e35e9a1a3f1eb7a3471c75c87cb096bbab62 |
23-Jun-2014 |
Scott Kennedy <skennedy@google.com> |
am ef5af8f4: am 9f78e2bd: am 1ceba204: am 868fffca: am ae07c2be: Fix directory lookups
* commit 'ef5af8f481d2312efea4926c662034342f500b1c':
|
| 75f5fc45821eea591f955ff38fd444221743610e |
23-Jun-2014 |
Kevin Lin <linkevin@google.com> |
am 161ddf55: am 9f85468d: am 2b2a375a: am 8f046ac9: am 95fedd51: Change to scrollToBottomView to be protected instead of private.
* commit '161ddf55a33ab8eb861c341457b351ba5658d676':
|
| 2c71de44c36fa38503064b81a692b1cfa078e6db |
23-Jun-2014 |
Kevin Lin <linkevin@google.com> |
am 7ebfa6e1: am 6f33043a: am 6396ce03: am 58228018: am a75fa12d: Fix chips library bugs related to setting the threshold to 1. - Dropdown not being dismissed after having at least one chip and typing a character and deleting it. - Selecting a chip, deleting it by pres
* commit '7ebfa6e1185102496292b3fa53863c6e0b7bfadc':
|
| c3112278a01212949622344a2f48365525a3e540 |
23-Jun-2014 |
Chris Craik <ccraik@google.com> |
am c198947d: am b65711a4: am 37ac47d3: am 01801599: am a3daacb2: Handle malformed gif streams more gracefully
* commit 'c198947d3f8bee6519ab153707351dd6d134810a':
|
| dc809e90438645cfc5e946684b35b8aab819a624 |
23-Jun-2014 |
William Luh <williamluh@google.com> |
am 26342585: am 11e4f6f1: Resolve tag conflict between exp_det_snet and gmail_perf_end.
* commit '26342585ded1a26c65827c92c341d9d69c484f67':
|
| b8ed3d8f884e73e34cba011da7f6217465c233c7 |
23-Jun-2014 |
William Luh <williamluh@google.com> |
am f1ef5227: am 70235389: Rename exp_det_snet tag to snet.
* commit 'f1ef5227245c4200a2b3afaa95cf1b1ac4d1bfef':
|
| ca1fb1ad6b3f8bd3b887e0c30a2a8ce475d523d5 |
23-Jun-2014 |
Baligh Uddin <baligh@google.com> |
am 1caf6b66: (-s ours) am c845eeac: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '1caf6b6630a4a134a5bab6d63b3c244b9ccc45a7':
|
| 0ce949dc2aab016e615ce640aba306e87c0c13a0 |
23-Jun-2014 |
Xavier Ducrohet <xav@google.com> |
am a16318ac: am 0b05bf59: Fix gradle\'s buildDir
* commit 'a16318ac2cf59b1e9ea0125d8cc60872df06c9f4':
|
| 511117731602187a1a26669ed131ae0d5d3ec55d |
23-Jun-2014 |
Xavier Ducrohet <xav@google.com> |
am 8cc76769: am 63d66d16: Disable break on lint error.
* commit '8cc767698ba1da147d79c4dd377bf57a153d1336':
|
| 593028dceeae62560214b0ed705a2242f5fe61ac |
23-Jun-2014 |
Scott Kennedy <skennedy@google.com> |
am 3750c6ea: am b0550328: am 6e247616: am a799ac06: am 26b19245: am 7b83246c: Build against api 19
* commit '3750c6ea7517ced4f0cc98b11776381b08d2eed3':
|
| e6e40f54d0583d3cb90d0bf7026c33beb1580dd5 |
23-Jun-2014 |
Scott Kennedy <skennedy@google.com> |
am c624a089: am 2aa11acb: am fab89bc1: am 41ec1e20: am 80478fa4: am e9b57c9e: Fix a small bug
* commit 'c624a089cc8010510375b4d40a399185c68d1f98':
|
| b80e5d5316ea9c8d27a42dad0ece66af2c7c5828 |
23-Jun-2014 |
Kevin Lin <linkevin@google.com> |
am d61499e2: am 669adddc: am 1376b739: am 9bfa2a6b: am be8700bb: am 2e7571b5: Fixed NPE in BaseRecipientAdapter when constraint is null.
* commit 'd61499e22cb3d80125fbb6c1ba27b4f8225e6770':
|
| 0245da4907d49a8e9e348b508cce70b08ae5db80 |
23-Jun-2014 |
Andrew Sapperstein <asapperstein@google.com> |
am 0308f870: am 6e3f5a05: am 51401366: am b74a98d1: am 263ca4e5: am 2b8b9029: Support RTL in chips library.
* commit '0308f8706cf6b30ce0383b2cf4c5d7974d5e6dd5':
|
| fa004d07dd043c1bc569a953ddb194249c541a81 |
23-Jun-2014 |
Kevin Lin <linkevin@google.com> |
am 49a26740: am 51fc7ff9: am 693a1515: am 60e3986c: am 09e73cb2: am 2b080e1e: Main changes to the chips library: Changed attribute styles - Added an avatar position (left, right) inside the chip - Added a disableDelete boolean - Removed chipsAlternateLayout
* commit '49a267405dd2483cb01111b8556aa59dfed09187':
|
| 58086ee34b97b509246992e51124a8b5088a99c4 |
23-Jun-2014 |
Xavier Ducrohet <xav@google.com> |
am 93b3c9a1: am 98c691d7: Update build-tools version for gradle.
* commit '93b3c9a13ed1ae2eea4866fcfcd02fc15f81843e':
|
| a0306d0e069737f999ae53d79c9cd0b23f1334b0 |
23-Jun-2014 |
Chris Craik <ccraik@google.com> |
am 73245428: am dd181e04: am df4ec5fe: am 52e97f30: am 8b501c37: am 2e201491: Fix jni method label
* commit '732454289ebb33b20a428b4cf8612f30615ecd51':
|
| 26c58e00d550d6b6d7b2de8ebaddb935c6113131 |
23-Jun-2014 |
Chris Craik <ccraik@google.com> |
am 41abd686: am e369a279: am c3279de0: am 017e96de: am a49a74cb: am e36c5d67: Add loop count control
* commit '41abd686df2bd538009480137b058ea6fc07abc2':
|
| 79aaa9c663ffcbcde0cd10364427370a04d72ff7 |
23-Jun-2014 |
John Reck <jreck@google.com> |
am 3690959f: am 98bbbe7f: am e96d44a0: am 83e63821: am bc8c31e4: am 335482c4: Fix make files for unbundled tree builds
* commit '3690959f713f342dd3b38ac4395354bdd529f860':
|
| 8a72ea039c6c2647eaa445f9181f9609d4797d97 |
23-Jun-2014 |
Chris Craik <ccraik@google.com> |
am e312b103: am 86709436: am 0b2aa72b: am 653b6da7: am 4947daa1: am 259f6b74: Mark framesequence test app strings as untranslatable
* commit 'e312b1035640c350425b51701c06addfcc32324a':
|
| 1621db4d174d219d38538210923b75a1c20d2733 |
23-Jun-2014 |
Chris Craik <ccraik@google.com> |
am 2ff92be6: am 30fd7d2d: resolved conflicts for merge of c78082b6 to master
* commit '2ff92be6268d654918a6ef8ab91dec9f3c999f6e':
|
| 529f7356fe72dfac55f243800338212ee7fb2bff |
23-Jun-2014 |
Geoff Mendal <mendal@google.com> |
am 6016cf6a: (-s ours) am 6ad0404d: (-s ours) Import translations. DO NOT MERGE
* commit '6016cf6ae355fa7652759acf7e530c25052d9219':
|
| c81705d6f6b82e29b19b94ce5fe75196b6a23d36 |
23-Jun-2014 |
Baligh Uddin <baligh@google.com> |
am 97b1f959: (-s ours) am 5b67708c: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '97b1f959fd35ddb4a9104f3800940194e7156820':
|
| 2c9cb79fa71d9f5847c7124addb6ec90d7fadb73 |
23-Jun-2014 |
John Reck <jreck@google.com> |
am c4b083ba: am 0014f661: Fix make files for unbundled tree builds
* commit 'c4b083ba73a2c3ac309bb12944c429b74648c4f4':
|
| 7e393e95c7d6e67334b1a4287d830aaca657ac67 |
23-Jun-2014 |
Chris Craik <ccraik@google.com> |
am acf0bd09: am 052fc0ab: Mark framesequence test app strings as untranslatable
* commit 'acf0bd0967f8d81c683ba4d8317680719adbc9b3':
|
| dc091264adadd83836c091777c2a35c308042704 |
23-Jun-2014 |
Chris Craik <ccraik@google.com> |
resolved conflicts for merge of 71ade8cd to master
Change-Id: Id99ca71d13c460438dca6f605353dc3c01c69ca7
|
| 74719a2c7548a4780059d1b5e3637c51da4e9013 |
23-Jun-2014 |
Scott Kennedy <skennedy@google.com> |
am b468c8fc: am 92591524: am e0b5c555: am 49f3ffd3: am 194dda10: Fix some warnings
* commit 'b468c8fc7e914220c457e390b23a54baee1a1c69':
|
| 340756673be2875c79d019b13ebb687942eb534f |
23-Jun-2014 |
Chris Craik <ccraik@google.com> |
am 2a2ff6ed: Merge "Add Animated WebP support in RasterMill"
* commit '2a2ff6ed0db11be779f55462ec30e60154db8e3d':
Add Animated WebP support in RasterMill
|
| cc9d3ec81ce751e1b924d8e659e17df3628f73c5 |
23-Jun-2014 |
John Reck <jreck@google.com> |
am bbeed672: Merge "Fix ALOG_ASSERT"
* commit 'bbeed6726cd11a0285a59225605c4ae33ee25257':
Fix ALOG_ASSERT
|
| 87e32715f91b39aa4a432f07e845d7879207279e |
23-Jun-2014 |
Tony Mantler <nicoya@google.com> |
am e5dfefd4: am f28f92f2: am 9fec16d3: am 9d2e3059: am 5d92cc5c: Call super.onAttached/onDetachedFromWindow
* commit 'e5dfefd454d1ca3467eb7b887f236c226452b51b':
|
| d9962b0cedef65c96b74d2981814adfb46ebfff3 |
23-Jun-2014 |
Igor Murashkin <iam@google.com> |
am 6a005419: Merge "camera2: BlockingStateListener invokes proxy before firing state change"
* commit '6a005419e50275062d97711ce8402b5d71940c81':
camera2: BlockingStateListener invokes proxy before firing state change
|
| 2bf26299da8f594ea996354044e140cf49a00665 |
23-Jun-2014 |
Jay Shrauner <shrauner@google.com> |
am f89f55d9: am c736dbcf: (-s ours) am e4dbcf35: am cf4d2a64: am 38ae6989: (-s ours) am ce2b95ae: Fix AudioEngine to allow re-initialization - DO NOT MERGE
* commit 'f89f55d9dcf65cd655922bc9b64a05fbbafc4626':
|
| 46d0b7d2b216e2acebd60f0c65d98f6880307c9c |
23-Jun-2014 |
Jay Shrauner <shrauner@google.com> |
am c5da8557: Merge "Fix AudioEngine to allow re-initialization"
* commit 'c5da8557f1a26e984b14b9eb64cda2d3d3ba71ce':
Fix AudioEngine to allow re-initialization
|
| f9339af106f5991be4fac80ed969800692259a7f |
23-Jun-2014 |
Mike Schneider <michschn@google.com> |
am 427a1270: am d06074aa: am 53e46a8c: am ae8431ea: am 79623848: am c842713d: fix visibility
* commit '427a1270d2ac5fd53d34aa0f860c9505e2ce4cbe':
|
| 979416faa212447a83829e04271263f5e462226a |
23-Jun-2014 |
Andrew Sapperstein <asapperstein@google.com> |
am 4b868ed8: am 27df5a3a: am 099915f7: am ebf46bcd: am 8eb56a43: am ae908d29: RTL - properly set text alignment and direction.
* commit '4b868ed83ce7db6f6a9f65f6d2bd020ea5f32c8b':
|
| 961457987d4d994c55aef30775fef9bdb9bf40ae |
23-Jun-2014 |
Kevin Lin <linkevin@google.com> |
am 30df46f9: am 8fc3233b: am 3c154ffa: am 3696df98: am 57b5b6fa: am 0c58c370: Fix redrawing chips with recipientEditText onSizeChanged when it has left and right padding.
* commit '30df46f9e6794df82ad5f762416d6e7fb8e71b89':
|
| 143219518025e983726674d2b52b5cf804f8080c |
23-Jun-2014 |
Kevin Lin <linkevin@google.com> |
am 53e68fc8: am 2c2b17ec: am 15fa87c9: am af559a10: am ab307ee2: am 66df41d9: Fix build with VisibleRecipientChip
* commit '53e68fc85221aca7a4bd91c7cf11785297ed7e63':
|
| 6fa46d4a80bf1524c5656bb0c2d19a3b065be282 |
23-Jun-2014 |
Kevin Lin <linkevin@google.com> |
am 82ef8639: am 07c0fcd1: am 93e48b10: am 0764e983: am 4a0aacfe: am d4ae44ec: Added support to choose vertical alignment for image spans.
* commit '82ef8639bf9c2d6e44fc6f903655e04da937dd52':
|
| 03491484367f61812538fd5f3c294c80cd85cd70 |
23-Jun-2014 |
Xavier Ducrohet <xav@google.com> |
am a26b2617: Fix buildDir issue.
* commit 'a26b26178f71fab3a6115b8cb094245f67ee003f':
Fix buildDir issue.
|
| 616c2b3e3c250b84ecb320341d8b9de81033ec42 |
23-Jun-2014 |
Baligh Uddin <baligh@google.com> |
am ef66d529: (-s ours) am 90b1744d: (-s ours) am 9a823b56: (-s ours) am 255166c7: (-s ours) am 30febb9a: (-s ours) am 64becd80: (-s ours) am e49544de: (-s ours) Import translations. DO NOT MERGE
* commit 'ef66d5292a0fa0a1ad1e0f8ac53f1457f51e132a':
|
| af181c16de60cf2625919159ea8091184c87cd18 |
23-Jun-2014 |
Scott Kennedy <skennedy@google.com> |
am 623648bd: am 5a32825f: am f4646b4c: am bb001e29: am 5da5d23b: BaseRecipientAdapter does not need to be abstract
* commit '623648bd77253a87a55d3f143631dd785fa01e50':
|
| 88249c610225f7ebb1ffe7afd7f95200003ea60c |
23-Jun-2014 |
Narayan Kamath <narayan@google.com> |
am 9ea321d1: am 2a573a6a: am 56bab444: Merge "AArch64: Fix GetChannelCount() declaration."
* commit '9ea321d115d8a620a02eb068ed539cca05d6243c':
|
| 346523acb0f1cc4ce2ea1d9e1335d24407ec25e0 |
23-Jun-2014 |
Narayan Kamath <narayan@google.com> |
am 29ec2dc1: am 7a690375: am 9ddd5eeb: Merge "AArch64: Minor JNI type changes"
* commit '29ec2dc1290d8bfb77445fce05c43117e030abed':
|
| ef5af8f481d2312efea4926c662034342f500b1c |
23-Jun-2014 |
Scott Kennedy <skennedy@google.com> |
am 9f78e2bd: am 1ceba204: am 868fffca: am ae07c2be: Fix directory lookups
* commit '9f78e2bdf2c19cb6321a5a3d21a7d4a7bb7f2aa9':
|
| 161ddf55a33ab8eb861c341457b351ba5658d676 |
23-Jun-2014 |
Kevin Lin <linkevin@google.com> |
am 9f85468d: am 2b2a375a: am 8f046ac9: am 95fedd51: Change to scrollToBottomView to be protected instead of private.
* commit '9f85468d65ef34a9aa1841e503ca1c6eab3c7e40':
|
| 7ebfa6e1185102496292b3fa53863c6e0b7bfadc |
23-Jun-2014 |
Kevin Lin <linkevin@google.com> |
am 6f33043a: am 6396ce03: am 58228018: am a75fa12d: Fix chips library bugs related to setting the threshold to 1. - Dropdown not being dismissed after having at least one chip and typing a character and deleting it. - Selecting a chip, deleting it by pressing backspac
* commit '6f33043ab5d3edcd855eef7793f7adcbdccae5bd':
|
| c198947d3f8bee6519ab153707351dd6d134810a |
23-Jun-2014 |
Chris Craik <ccraik@google.com> |
am b65711a4: am 37ac47d3: am 01801599: am a3daacb2: Handle malformed gif streams more gracefully
* commit 'b65711a4213ccb8deac1c462e6aa1fc700a235e5':
|
| 26342585ded1a26c65827c92c341d9d69c484f67 |
23-Jun-2014 |
William Luh <williamluh@google.com> |
am 11e4f6f1: Resolve tag conflict between exp_det_snet and gmail_perf_end.
* commit '11e4f6f1d60924036491f33c6d5b31e31f8455bc':
Resolve tag conflict between exp_det_snet and gmail_perf_end.
|
| f1ef5227245c4200a2b3afaa95cf1b1ac4d1bfef |
23-Jun-2014 |
William Luh <williamluh@google.com> |
am 70235389: Rename exp_det_snet tag to snet.
* commit '70235389c1735428b1ee8b2e145e867f11ea6992':
Rename exp_det_snet tag to snet.
|
| 1caf6b6630a4a134a5bab6d63b3c244b9ccc45a7 |
23-Jun-2014 |
Baligh Uddin <baligh@google.com> |
am c845eeac: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit 'c845eeac1e4c00ac2f398e6d8737c09d528d3eb6':
Import translations. DO NOT MERGE
|
| a16318ac2cf59b1e9ea0125d8cc60872df06c9f4 |
23-Jun-2014 |
Xavier Ducrohet <xav@google.com> |
am 0b05bf59: Fix gradle\'s buildDir
* commit '0b05bf5927c021f997091b072a354bc5a609989b':
Fix gradle's buildDir
|
| 8cc767698ba1da147d79c4dd377bf57a153d1336 |
23-Jun-2014 |
Xavier Ducrohet <xav@google.com> |
am 63d66d16: Disable break on lint error.
* commit '63d66d166e4daa184e1d6de951f0906f7b803f25':
Disable break on lint error.
|
| 3750c6ea7517ced4f0cc98b11776381b08d2eed3 |
23-Jun-2014 |
Scott Kennedy <skennedy@google.com> |
am b0550328: am 6e247616: am a799ac06: am 26b19245: am 7b83246c: Build against api 19
* commit 'b0550328509bf2b7e28d88ad2a2255865c439bc7':
|
| c624a089cc8010510375b4d40a399185c68d1f98 |
23-Jun-2014 |
Scott Kennedy <skennedy@google.com> |
am 2aa11acb: am fab89bc1: am 41ec1e20: am 80478fa4: am e9b57c9e: Fix a small bug
* commit '2aa11acb0d32e7d85a8f3ec1fd32e62fdfd8d66e':
|
| d61499e22cb3d80125fbb6c1ba27b4f8225e6770 |
23-Jun-2014 |
Kevin Lin <linkevin@google.com> |
am 669adddc: am 1376b739: am 9bfa2a6b: am be8700bb: am 2e7571b5: Fixed NPE in BaseRecipientAdapter when constraint is null.
* commit '669adddca65b7c41047feffd7bb646ca0f1b33f4':
|
| 0308f8706cf6b30ce0383b2cf4c5d7974d5e6dd5 |
23-Jun-2014 |
Andrew Sapperstein <asapperstein@google.com> |
am 6e3f5a05: am 51401366: am b74a98d1: am 263ca4e5: am 2b8b9029: Support RTL in chips library.
* commit '6e3f5a05061ffa3cc4a0cf374fb0fe28e46f2e56':
|
| 49a267405dd2483cb01111b8556aa59dfed09187 |
23-Jun-2014 |
Kevin Lin <linkevin@google.com> |
am 51fc7ff9: am 693a1515: am 60e3986c: am 09e73cb2: am 2b080e1e: Main changes to the chips library: Changed attribute styles - Added an avatar position (left, right) inside the chip - Added a disableDelete boolean - Removed chipsAlternateLayout
* commit '51fc7ff960b57f6bc3ae393d9ae7ecc27031eae0':
|
| 93b3c9a13ed1ae2eea4866fcfcd02fc15f81843e |
23-Jun-2014 |
Xavier Ducrohet <xav@google.com> |
am 98c691d7: Update build-tools version for gradle.
* commit '98c691d7177f782bec3b2f8231f174c612b85d06':
Update build-tools version for gradle.
|
| 732454289ebb33b20a428b4cf8612f30615ecd51 |
23-Jun-2014 |
Chris Craik <ccraik@google.com> |
am dd181e04: am df4ec5fe: am 52e97f30: am 8b501c37: am 2e201491: Fix jni method label
* commit 'dd181e04691d58e3b16b14025a8ca5a2fe00c35e':
|
| 41abd686df2bd538009480137b058ea6fc07abc2 |
23-Jun-2014 |
Chris Craik <ccraik@google.com> |
am e369a279: am c3279de0: am 017e96de: am a49a74cb: am e36c5d67: Add loop count control
* commit 'e369a279acf2d3bb9e51c474df92ffe34d56dd5a':
|
| 3690959f713f342dd3b38ac4395354bdd529f860 |
23-Jun-2014 |
John Reck <jreck@google.com> |
am 98bbbe7f: am e96d44a0: am 83e63821: am bc8c31e4: am 335482c4: Fix make files for unbundled tree builds
* commit '98bbbe7fdaec2cea1d8188c7d3203d0d984ea6d5':
|
| e312b1035640c350425b51701c06addfcc32324a |
23-Jun-2014 |
Chris Craik <ccraik@google.com> |
am 86709436: am 0b2aa72b: am 653b6da7: am 4947daa1: am 259f6b74: Mark framesequence test app strings as untranslatable
* commit '867094365c0eef6102c07173f9903e7b8016a990':
|
| 2ff92be6268d654918a6ef8ab91dec9f3c999f6e |
23-Jun-2014 |
Chris Craik <ccraik@google.com> |
am 30fd7d2d: resolved conflicts for merge of c78082b6 to master
* commit '30fd7d2d82a13dba3580dd848084cba73cdd3eb9':
|
| 6016cf6ae355fa7652759acf7e530c25052d9219 |
23-Jun-2014 |
Geoff Mendal <mendal@google.com> |
am 6ad0404d: (-s ours) Import translations. DO NOT MERGE
* commit '6ad0404d0661a0f5b9b0e385b8cb3aa281fa041a':
Import translations. DO NOT MERGE
|
| 97b1f959fd35ddb4a9104f3800940194e7156820 |
23-Jun-2014 |
Baligh Uddin <baligh@google.com> |
am 5b67708c: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '5b67708cea54455de2d06a3386d023a399d78417':
Import translations. DO NOT MERGE
|
| c4b083ba73a2c3ac309bb12944c429b74648c4f4 |
23-Jun-2014 |
John Reck <jreck@google.com> |
am 0014f661: Fix make files for unbundled tree builds
* commit '0014f661f355008b0ada8ff9562673b69014d3f6':
Fix make files for unbundled tree builds
|
| acf0bd0967f8d81c683ba4d8317680719adbc9b3 |
23-Jun-2014 |
Chris Craik <ccraik@google.com> |
am 052fc0ab: Mark framesequence test app strings as untranslatable
* commit '052fc0abbfc7f339b2283ae6497febd6e03f0340':
Mark framesequence test app strings as untranslatable
|
| 71ade8cdaba68e609080e46b8e2d06e8d87e4408 |
23-Jun-2014 |
Chris Craik <ccraik@google.com> |
resolved conflicts for merge of 8f65fceb to klp-modular-dev-plus-aosp
Change-Id: I386fea0f721b2de9ecd66be83d84d3c4bd6ff70f
|
| 47d95004c26eedbb468e182377c16fd371d389dd |
23-Jun-2014 |
William Luh <williamluh@google.com> |
am 47224cf1: Add event log tag for Android SNet.
* commit '47224cf1e37ad695ceaa0271aec9878aa13e62b7':
Add event log tag for Android SNet.
|
| ff7e1a6d49fb09185ed3e974dc2910a3942eeb5c |
23-Jun-2014 |
Baligh Uddin <baligh@google.com> |
am a8ccb2d2: (-s ours) am e707db99: (-s ours) am 95b439e0: (-s ours) am c36fa7f8: (-s ours) am 58ce8de3: (-s ours) am 6b48b5de: (-s ours) Import translations. DO NOT MERGE
* commit 'a8ccb2d20a659f55c7e5f670fe90171fe8259d68':
|
| ae7ac25ffbbe5d855a7cbc8b940916a24c777027 |
23-Jun-2014 |
Baligh Uddin <baligh@google.com> |
am ad7bb081: (-s ours) Import translations. DO NOT MERGE
* commit 'ad7bb0817486ec52d9c1451873c1220d9e5a0512':
Import translations. DO NOT MERGE
|
| df08a78ef76946441fdceb5b23a73221bad9cd1e |
23-Jun-2014 |
Baligh Uddin <baligh@google.com> |
am 16c2fc90: Remove deprecated locales (values-be)
* commit '16c2fc90384a901f442226f46eaa72c153189cc5':
Remove deprecated locales (values-be)
|
| 7299bda6eb46bb468d97befff622bb1c4d4a0e69 |
23-Jun-2014 |
Baligh Uddin <baligh@google.com> |
am 7a21dec1: (-s ours) Import translations. DO NOT MERGE
* commit '7a21dec19ae7fe9c3f7856cda12b0499ba2a1ccc':
Import translations. DO NOT MERGE
|
| c12ab7d711b74c5b280dd28ba414f099d935e8ff |
23-Jun-2014 |
Baligh Uddin <baligh@google.com> |
am fbe88af0: Remove deprecated locale (be)
* commit 'fbe88af0fd898ddd4ada17e6506a04517193aaf6':
Remove deprecated locale (be)
|
| cc4f905170838d0d98f33e3c4b053aba56a8a499 |
23-Jun-2014 |
Scott Kennedy <skennedy@google.com> |
am 4fa4a3f4: am fdad3f16: am 5e3d1fa1: am 3e8176df: Don\'t show the alternates dialog for GAL contacts
* commit '4fa4a3f4f790542781cdd2abd59b1cab18e5378d':
|
| a7d06f0b5bd527feef31ec035d873ac5784af2fb |
23-Jun-2014 |
Baligh Uddin <baligh@google.com> |
am 61068eae: Remove deprecated locales.
* commit '61068eae9176d5d0c49efd1c2f7f3f5ccde12d98':
Remove deprecated locales.
|
| 7018a8a01fa0bf65c715a32d7781cad0b46753ca |
23-Jun-2014 |
Ed Heyl <edheyl@google.com> |
am 6889dfab: am e0b8940b: am 4a17a810: am 72dbb5bf: merge in release branch changes (no-op).
* commit '6889dfab1a88f584d6eeb91cd37e1ad09988961a':
|
| e33e3122ef829caf74a15b28a15e1ac7d5c1dd7b |
23-Jun-2014 |
Zhijun He <zhijunhe@google.com> |
am 44aacce1: am 400bcf43: am 0cc7337b: am 020e6d9b: Merge "camera2: Add updateCaptureRequest method" into klp-dev
* commit '44aacce1e8de2a82c69fa0e0293d26acd32824ae':
|
| b4a1896cc085c6908f6c5b06fc9d8f2fe4f8b27a |
23-Jun-2014 |
Igor Murashkin <iam@google.com> |
am f5e6de4c: am 5e3b1f15: am 536308c3: am e2fa3d71: camera2: Add #resetState to AutoFocusStateMachine
* commit 'f5e6de4c0a2afecf825beb6881a650bab92d5010':
|
| 647e1bdf4ae59ebafc75c6686754ff2c7f39b655 |
23-Jun-2014 |
Igor Murashkin <iam@google.com> |
am 6079ae66: am 5e1997a0: am ad9d6b03: am 2d8e55f4: camera2: Add tracing to AutoFocusStateMachine (lens-locking actions only)
* commit '6079ae66952fcfcdd3040d887645fcf0a2068d01':
|
| fe02e0bfcded6901151046805f19141d498bd731 |
23-Jun-2014 |
Igor Murashkin <iam@google.com> |
am 3840bf87: am 98155f86: am 5e9746b7: am 1e125c71: Merge "gcam: Add empty SysTrace class" into klp-dev
* commit '3840bf87b9b439c32555fb05dba129a62e15b5e0':
|
| 9b80409a54e3ff922866393643db8bb3aac9557f |
23-Jun-2014 |
Baligh Uddin <baligh@google.com> |
am b513f30a: (-s ours) Import translations. DO NOT MERGE
* commit 'b513f30a1f2a705e547dec7dfe958102ccf19d93':
Import translations. DO NOT MERGE
|
| c61cccaf61bf3cc1920d3d0d33cca598af99f0d7 |
23-Jun-2014 |
Scott Kennedy <skennedy@google.com> |
am 7b2821e5: am b7ceb9ae: am 5dab3464: Don\'t translate "Chips Sample"
* commit '7b2821e596ca30d49cab5dc79688dbf93886f88f':
|
| 7ecf53c0d4d6bb4ae98d7828d0a3dc0367c33971 |
23-Jun-2014 |
Igor Murashkin <iam@google.com> |
am e44f94d8: am 86c1b41e: am 93d176ff: am 806d114d: camera2: Harden AutoFocusStateMachine against null values in callbacks
* commit 'e44f94d82aa58874b1d87c0d0068e58b9fc3a7de':
|
| 6039651c390012deba6432f733d1265e0e4dab26 |
23-Jun-2014 |
Tony Mantler <nicoya@google.com> |
am cf73211f: am a41a6d0e: am 926c9905: am e444c661: am eaf43ea2: Don\'t show pop-ups and dialogs if we\'re not attached to a valid window.
* commit 'cf73211f765c33da77b22968fdad911663d27d9d':
|
| a8d919844df2385ccea9efb0d2b11e32a4a6cee7 |
23-Jun-2014 |
Igor Murashkin <iam@google.com> |
am ae6930b3: am 5ba33b0b: am 7d297cff: am ba7f0254: camera2: Skip AF state updates when afMode/afState are missing
* commit 'ae6930b3141c07bc6e4ecf206810bb3256968a99':
|
| 8abc5d98ae6e1493f88a092ef6614fe17f1823b9 |
23-Jun-2014 |
Eino-Ville Talvala <etalvala@google.com> |
am b6a57b4b: am f7fdaf86: am 35beb4e5: am 7705b0b8: Revert "Revert "Camera2: Use hidden APIs""
* commit 'b6a57b4b97a174049eeb9148240b3363902bff6d':
|
| 2f9d782018ce9082f5393ff18746dd7db8a543a3 |
23-Jun-2014 |
Eino-Ville Talvala <etalvala@google.com> |
am ca0a4a54: am 76978a04: am 6102db91: am 08f250d9: Revert "Camera2: Use hidden APIs"
* commit 'ca0a4a543ca13501132945a6e1c2ab349a0c77de':
|
| 405a672bd125615c5b7177ecb1d8d23dffa8cdc2 |
23-Jun-2014 |
Eino-Ville Talvala <etalvala@google.com> |
am 7b80334d: am 8390c35f: am 26825617: am 51bb20d6: Camera2: Use hidden APIs
* commit '7b80334d345e6db6880d0cfd530a0a56d529fa99':
|
| 6967b6a0031cc49e33d720c386391e2fd93997df |
23-Jun-2014 |
Scott Kennedy <skennedy@google.com> |
am e8f64dd6: am 0c8f9ac7: am 490e81a7: Merge chips from jb-ub-mail-ur11 into klp-ub-dev
* commit 'e8f64dd6272dbb4d7543686588aa0536cee5068b':
|
| 7886cd48b61ec7ca4d6b1c1e824c6511c191527e |
23-Jun-2014 |
Eino-Ville Talvala <etalvala@google.com> |
am 97c9c967: am a2658223: am 44bd229d: am a25c5599: Camera2: Add a blocking state listener
* commit '97c9c967d7c67d5f5a188d47e2fedb245d3fa72a':
|
| 91d628aaa6ca16bf04564ffe2d250bbe65a0993b |
23-Jun-2014 |
Igor Murashkin <iam@google.com> |
am 385d4b78: am 6bc47adb: am 15a49e43: am a47d6986: gcam: Make AF more tolerant to transitioning into same state
* commit '385d4b78f7afe2a19a0b950927a25f6e49a34b75':
|
| eacf623073c5ea7bd6c2770d8347aaf546d2554c |
23-Jun-2014 |
Igor Murashkin <iam@google.com> |
am dbbf87fd: am 6b9345ec: am 08dbbb52: am 9fcc8956: Merge "camera2: Add passive unfocused state to AF state machine" into klp-dev
* commit 'dbbf87fdcf5adde06a7c8c0421fb71523090f0ce':
|
| 535efff41e7b24c7278777c3e64405da8b25eb74 |
23-Jun-2014 |
Baligh Uddin <baligh@google.com> |
am 78ba442e: (-s ours) am 3a50b9e1: (-s ours) am a2ba4d5a: (-s ours) am 19411cda: (-s ours) am da5cd8c4: (-s ours) Import translations. DO NOT MERGE
* commit '78ba442e36eb5d4b9173fed99aeafea2489e7fdb':
|
| b94757d81034d61d0a5be20582cf72394d844ae5 |
23-Jun-2014 |
Igor Murashkin <iam@google.com> |
am b7289e33: am 8fee1a5a: am 6c5cc576: Merge "camera2: Add state machine for doing auto-focus easily from apps" into klp-dev
* commit 'b7289e33f94b62ef1bb5ca7ff8d33d645d647c16':
|
| 252eb8479f17e384da1321a5fb974f5eb87dbb12 |
23-Jun-2014 |
Igor Murashkin <iam@google.com> |
am e88d7fe6: am 6c5cc576: Merge "camera2: Add state machine for doing auto-focus easily from apps" into klp-dev
* commit 'e88d7fe6975b037909879f96eeae128e308ef508':
|
| 1e3959d2b7fe0e8eecf72b57a6cb6e98371b158a |
23-Jun-2014 |
Baligh Uddin <baligh@google.com> |
am 35216c7a: (-s ours) am 515b0b54: (-s ours) am 30028a02: (-s ours) Import translations. DO NOT MERGE
* commit '35216c7afb58dea26f454371e7b8dac9f742295b':
|
| d7aaa2513e0af5f6670c8b62182adc4f1b7532fa |
23-Jun-2014 |
Igor Murashkin <iam@google.com> |
am b0c4eea2: am f295cb24: am 07f09b47: camera2: New directory with camera2 extras/helpers
* commit 'b0c4eea2c6156d6115ea4b36473115c8e85f7131':
|
| 3384585a46cdd77f9e2bf1d07d5e2f2c0130f986 |
23-Jun-2014 |
Baligh Uddin <baligh@google.com> |
am 848a8fc2: (-s ours) Import translations. DO NOT MERGE
* commit '848a8fc210c4c9268d8ea3b7f552a53716c5a1d6':
Import translations. DO NOT MERGE
|
| a9c538c5b56f18d2336db4cbdcfe5d216d76779d |
23-Jun-2014 |
Baligh Uddin <baligh@google.com> |
am e26c981f: (-s ours) am fc62ce02: (-s ours) am 432e542f: (-s ours) Import translations. DO NOT MERGE
* commit 'e26c981fab9bb63c0baa6284e94dde3ef63fd793':
|
| 612f55dfb8e5d9744be26f5ad0a795168063a172 |
23-Jun-2014 |
Baligh Uddin <baligh@google.com> |
am 109c6f5f: (-s ours) Import translations. DO NOT MERGE
* commit '109c6f5fa77062d43469d2fce6a4f5c3e9b13c87':
Import translations. DO NOT MERGE
|
| 3d6d550a862f475f16998c6829c6ad36d458a411 |
23-Jun-2014 |
Baligh Uddin <baligh@google.com> |
am c7001409: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit 'c7001409187b6c98de2524a8eab8e177011fcc03':
Import translations. DO NOT MERGE
|
| 5bba4287c5bcdb1b326a7e65ce4a7a46bf861ba7 |
23-Jun-2014 |
Alon Albert <aalbert@google.com> |
am 14f4958d: am 6418de9f: Merge "Refactor List<Partition> to Partition[]" into klp-dev
* commit '14f4958d503c89401df84a92b7ea8915961d3e9b':
|
| 9d56714eb93a9d3639f266fe4b94c3ff31efcc65 |
23-Jun-2014 |
Scott Kennedy <skennedy@google.com> |
am fa9b0c6d: am e407bff4: am 3be35a39: Remove some unused resources and imports
* commit 'fa9b0c6d4920671fd8ade0557201d51d1be0d95b':
|
| 7d10fb4af180be90783632cc6ada13c533e85515 |
23-Jun-2014 |
Baligh Uddin <baligh@google.com> |
am 328b133b: (-s ours) Import translations. DO NOT MERGE
* commit '328b133b28fe17758b75b04b898c74207551909f':
Import translations. DO NOT MERGE
|
| 89841816e67c858a6c8dfb670ac8f5ef1e4d052b |
23-Jun-2014 |
Jay Shrauner <shrauner@google.com> |
am efb76c30: am 6b425b5e: am 30d26326: Add directory photo support
* commit 'efb76c302fba3ac553ae07a0fd0e0d296ccbcf41':
|
| 87ff23f3f5338518c607f47e347a384738ca6595 |
23-Jun-2014 |
Baligh Uddin <baligh@google.com> |
am 3e6f65be: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '3e6f65be3fabf89044182dab2d872ef58d076ee3':
Import translations. DO NOT MERGE
|
| f101fd7d198036b7e9f9015c93cbf005d0771ccb |
23-Jun-2014 |
Jay Shrauner <shrauner@google.com> |
am 289d819c: am 30d26326: Add directory photo support
* commit '289d819c05337c49809ad275eca7206658d298b7':
|
| a3680581767fa5c3ddfca68e633246a95b0c8cd5 |
23-Jun-2014 |
Doug Zongker <dougz@google.com> |
Merge "fix race condition in OperationScheduler"
|
| 77ffe2074affbef2ff8876ae64d20f5923222de7 |
23-Jun-2014 |
Doug Zongker <dougz@google.com> |
fix race condition in OperationScheduler
OperationScheduler's toString() method got the set of keys from a
SharedPreferences, and then did individual lookups of those keys
assuming they would all succeed, but the shared prefs object can be
mutated by a another thread while that is going on.
Fix to take a snapshot with getAll() and then iterate over the
snapshot.
Bug: 15744821
Change-Id: I6a901ec7f4e632e149db3bf6c226f935bc152402
ommon/java/com/android/common/OperationScheduler.java
|
| 51ee4292efe5cd29439c593b6d4fec7093224399 |
23-Jun-2014 |
William Luh <williamluh@google.com> |
am 47d95004: am 47224cf1: Add event log tag for Android SNet.
* commit '47d95004c26eedbb468e182377c16fd371d389dd':
|
| 2b7ebad88241634ed5b3ea777fd77ac4406d7f85 |
23-Jun-2014 |
Baligh Uddin <baligh@google.com> |
am ff7e1a6d: (-s ours) am a8ccb2d2: (-s ours) am e707db99: (-s ours) am 95b439e0: (-s ours) am c36fa7f8: (-s ours) am 58ce8de3: (-s ours) am 6b48b5de: (-s ours) Import translations. DO NOT MERGE
* commit 'ff7e1a6d49fb09185ed3e974dc2910a3942eeb5c':
|
| 897e1a832930320b11291ca6c7482c2820395652 |
23-Jun-2014 |
Baligh Uddin <baligh@google.com> |
am ae7ac25f: (-s ours) am ad7bb081: (-s ours) Import translations. DO NOT MERGE
* commit 'ae7ac25ffbbe5d855a7cbc8b940916a24c777027':
|
| 633c325fec268ab21d2c782b510c814931bfa0e0 |
23-Jun-2014 |
Baligh Uddin <baligh@google.com> |
am df08a78e: am 16c2fc90: Remove deprecated locales (values-be)
* commit 'df08a78ef76946441fdceb5b23a73221bad9cd1e':
|
| 0b0c214362ccd009c9f5c332fa0636f7c72f3189 |
23-Jun-2014 |
Baligh Uddin <baligh@google.com> |
am 7299bda6: (-s ours) am 7a21dec1: (-s ours) Import translations. DO NOT MERGE
* commit '7299bda6eb46bb468d97befff622bb1c4d4a0e69':
|
| dd53cbd2b90d7044a99e65907267cdc39dd25344 |
23-Jun-2014 |
Baligh Uddin <baligh@google.com> |
am c12ab7d7: am fbe88af0: Remove deprecated locale (be)
* commit 'c12ab7d711b74c5b280dd28ba414f099d935e8ff':
|
| f13eeb9dff582e6777d5f8fa56eefc492eb62a9d |
23-Jun-2014 |
Scott Kennedy <skennedy@google.com> |
am cc4f9051: am 4fa4a3f4: am fdad3f16: am 5e3d1fa1: am 3e8176df: Don\'t show the alternates dialog for GAL contacts
* commit 'cc4f905170838d0d98f33e3c4b053aba56a8a499':
|
| 7cf8715895330a62f7ad7bcab5427fc34a3fc802 |
23-Jun-2014 |
Baligh Uddin <baligh@google.com> |
am a7d06f0b: am 61068eae: Remove deprecated locales.
* commit 'a7d06f0b5bd527feef31ec035d873ac5784af2fb':
|
| 276bff1adc13a1e386d125abdaccde4e2bf3640e |
23-Jun-2014 |
Ed Heyl <edheyl@google.com> |
am 7018a8a0: am 6889dfab: am e0b8940b: am 4a17a810: am 72dbb5bf: merge in release branch changes (no-op).
* commit '7018a8a01fa0bf65c715a32d7781cad0b46753ca':
|
| 179ea8656543a5e052d1426ac3c01cf1e82971b1 |
23-Jun-2014 |
Zhijun He <zhijunhe@google.com> |
am e33e3122: am 44aacce1: am 400bcf43: am 0cc7337b: am 020e6d9b: Merge "camera2: Add updateCaptureRequest method" into klp-dev
* commit 'e33e3122ef829caf74a15b28a15e1ac7d5c1dd7b':
|
| b9db4dd849d59ae102ab9611023506d778efeddc |
23-Jun-2014 |
Igor Murashkin <iam@google.com> |
am b4a1896c: am f5e6de4c: am 5e3b1f15: am 536308c3: am e2fa3d71: camera2: Add #resetState to AutoFocusStateMachine
* commit 'b4a1896cc085c6908f6c5b06fc9d8f2fe4f8b27a':
|
| abbd9fec2025734e37af3ec06125281893277dea |
23-Jun-2014 |
Igor Murashkin <iam@google.com> |
am 647e1bdf: am 6079ae66: am 5e1997a0: am ad9d6b03: am 2d8e55f4: camera2: Add tracing to AutoFocusStateMachine (lens-locking actions only)
* commit '647e1bdf4ae59ebafc75c6686754ff2c7f39b655':
|
| c5a22bcb0a8bd0eb038713016695c48a851470e8 |
23-Jun-2014 |
Igor Murashkin <iam@google.com> |
am fe02e0bf: am 3840bf87: am 98155f86: am 5e9746b7: am 1e125c71: Merge "gcam: Add empty SysTrace class" into klp-dev
* commit 'fe02e0bfcded6901151046805f19141d498bd731':
|
| 0b53678b5c505390605aab1633c326ff9e57eb9f |
23-Jun-2014 |
Baligh Uddin <baligh@google.com> |
am 9b80409a: (-s ours) am b513f30a: (-s ours) Import translations. DO NOT MERGE
* commit '9b80409a54e3ff922866393643db8bb3aac9557f':
|
| 6d475df0c846511e4cb83f66d9536fdcd38224c7 |
23-Jun-2014 |
Scott Kennedy <skennedy@google.com> |
am c61cccaf: am 7b2821e5: am b7ceb9ae: am 5dab3464: Don\'t translate "Chips Sample"
* commit 'c61cccaf61bf3cc1920d3d0d33cca598af99f0d7':
|
| 99ec1561b9a99b4d9c733cf5afaece041d873400 |
23-Jun-2014 |
Igor Murashkin <iam@google.com> |
am 7ecf53c0: am e44f94d8: am 86c1b41e: am 93d176ff: am 806d114d: camera2: Harden AutoFocusStateMachine against null values in callbacks
* commit '7ecf53c0d4d6bb4ae98d7828d0a3dc0367c33971':
|
| 58c586ddac6ea727b7475c72df01df76a68796f2 |
23-Jun-2014 |
Tony Mantler <nicoya@google.com> |
am 6039651c: am cf73211f: am a41a6d0e: am 926c9905: am e444c661: am eaf43ea2: Don\'t show pop-ups and dialogs if we\'re not attached to a valid window.
* commit '6039651c390012deba6432f733d1265e0e4dab26':
|
| a3731685355e32282a17b2f5c73cb8a61c625083 |
23-Jun-2014 |
Igor Murashkin <iam@google.com> |
am a8d91984: am ae6930b3: am 5ba33b0b: am 7d297cff: am ba7f0254: camera2: Skip AF state updates when afMode/afState are missing
* commit 'a8d919844df2385ccea9efb0d2b11e32a4a6cee7':
|
| df27ed3d956d39f4a1e54bc76cc76799e1bc5fd6 |
23-Jun-2014 |
Eino-Ville Talvala <etalvala@google.com> |
am 8abc5d98: am b6a57b4b: am f7fdaf86: am 35beb4e5: am 7705b0b8: Revert "Revert "Camera2: Use hidden APIs""
* commit '8abc5d98ae6e1493f88a092ef6614fe17f1823b9':
|
| b05fa500ea0545974ab54e3236367f3cbbadef66 |
23-Jun-2014 |
Eino-Ville Talvala <etalvala@google.com> |
am 2f9d7820: am ca0a4a54: am 76978a04: am 6102db91: am 08f250d9: Revert "Camera2: Use hidden APIs"
* commit '2f9d782018ce9082f5393ff18746dd7db8a543a3':
|
| e7ba1c1d9839e44a28f73876e96ee1e43857117f |
23-Jun-2014 |
Eino-Ville Talvala <etalvala@google.com> |
am 405a672b: am 7b80334d: am 8390c35f: am 26825617: am 51bb20d6: Camera2: Use hidden APIs
* commit '405a672bd125615c5b7177ecb1d8d23dffa8cdc2':
|
| 20d73db4db7be0586e3127f618f93ecc72639ecc |
23-Jun-2014 |
Scott Kennedy <skennedy@google.com> |
am 6967b6a0: am e8f64dd6: am 0c8f9ac7: am 490e81a7: Merge chips from jb-ub-mail-ur11 into klp-ub-dev
* commit '6967b6a0031cc49e33d720c386391e2fd93997df':
|
| d0f631d5ded1c8806f6e538a6c013c1d4e625726 |
23-Jun-2014 |
Eino-Ville Talvala <etalvala@google.com> |
am 7886cd48: am 97c9c967: am a2658223: am 44bd229d: am a25c5599: Camera2: Add a blocking state listener
* commit '7886cd48b61ec7ca4d6b1c1e824c6511c191527e':
|
| c320a89a4fb172dcdb748a49893dcd4753d30353 |
23-Jun-2014 |
Igor Murashkin <iam@google.com> |
am 91d628aa: am 385d4b78: am 6bc47adb: am 15a49e43: am a47d6986: gcam: Make AF more tolerant to transitioning into same state
* commit '91d628aaa6ca16bf04564ffe2d250bbe65a0993b':
|
| f209c0626236ec906f5b11551f982a1022b0eade |
23-Jun-2014 |
Igor Murashkin <iam@google.com> |
am eacf6230: am dbbf87fd: am 6b9345ec: am 08dbbb52: am 9fcc8956: Merge "camera2: Add passive unfocused state to AF state machine" into klp-dev
* commit 'eacf623073c5ea7bd6c2770d8347aaf546d2554c':
|
| e1c14bf5ebc0f542a54c834162d8fee641ab536c |
23-Jun-2014 |
Baligh Uddin <baligh@google.com> |
am 535efff4: (-s ours) am 78ba442e: (-s ours) am 3a50b9e1: (-s ours) am a2ba4d5a: (-s ours) am 19411cda: (-s ours) am da5cd8c4: (-s ours) Import translations. DO NOT MERGE
* commit '535efff41e7b24c7278777c3e64405da8b25eb74':
|
| eb30c8e031358c20cac4a973963166be8e0e4119 |
23-Jun-2014 |
Igor Murashkin <iam@google.com> |
am b94757d8: am b7289e33: am 8fee1a5a: am 6c5cc576: Merge "camera2: Add state machine for doing auto-focus easily from apps" into klp-dev
* commit 'b94757d81034d61d0a5be20582cf72394d844ae5':
|
| 3c3367ca4b998375e8bcadc68bff37286de0bd51 |
23-Jun-2014 |
Igor Murashkin <iam@google.com> |
am 252eb847: am e88d7fe6: am 6c5cc576: Merge "camera2: Add state machine for doing auto-focus easily from apps" into klp-dev
* commit '252eb8479f17e384da1321a5fb974f5eb87dbb12':
|
| c3cfd0c4fdfc7a0033a5adc6aa0a51e59a7d7d20 |
23-Jun-2014 |
Baligh Uddin <baligh@google.com> |
am 1e3959d2: (-s ours) am 35216c7a: (-s ours) am 515b0b54: (-s ours) am 30028a02: (-s ours) Import translations. DO NOT MERGE
* commit '1e3959d2b7fe0e8eecf72b57a6cb6e98371b158a':
|
| c86f4d6b1d3d36b85dc897185da2f7ae6ac42bd2 |
23-Jun-2014 |
Igor Murashkin <iam@google.com> |
am d7aaa251: am b0c4eea2: am f295cb24: am 07f09b47: camera2: New directory with camera2 extras/helpers
* commit 'd7aaa2513e0af5f6670c8b62182adc4f1b7532fa':
|
| 18f639ca3d3aecb3f9e23e4ea4ae9e05bc3e8230 |
23-Jun-2014 |
Baligh Uddin <baligh@google.com> |
am 3384585a: (-s ours) am 848a8fc2: (-s ours) Import translations. DO NOT MERGE
* commit '3384585a46cdd77f9e2bf1d07d5e2f2c0130f986':
|
| b4715023acb61472edd0e21bc0492869733cc5f4 |
23-Jun-2014 |
Baligh Uddin <baligh@google.com> |
am a9c538c5: (-s ours) am e26c981f: (-s ours) am fc62ce02: (-s ours) am 432e542f: (-s ours) Import translations. DO NOT MERGE
* commit 'a9c538c5b56f18d2336db4cbdcfe5d216d76779d':
|
| 3d5fc80792f6efa3e738779b72bae2bd1dff7783 |
23-Jun-2014 |
Baligh Uddin <baligh@google.com> |
am 612f55df: (-s ours) am 109c6f5f: (-s ours) Import translations. DO NOT MERGE
* commit '612f55dfb8e5d9744be26f5ad0a795168063a172':
|
| b76c9fcc9168dd3ea7cd8a500b07241435339930 |
23-Jun-2014 |
Baligh Uddin <baligh@google.com> |
am 3d6d550a: (-s ours) am c7001409: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '3d6d550a862f475f16998c6829c6ad36d458a411':
|
| 01ef2d65e0068f160a602c0e9c2f7f8a2a3f05b3 |
23-Jun-2014 |
Alon Albert <aalbert@google.com> |
am 5bba4287: am 14f4958d: am 6418de9f: Merge "Refactor List<Partition> to Partition[]" into klp-dev
* commit '5bba4287c5bcdb1b326a7e65ce4a7a46bf861ba7':
|
| 246daae54d57c77de578be03cf850e949adf1227 |
23-Jun-2014 |
Scott Kennedy <skennedy@google.com> |
am 9d56714e: am fa9b0c6d: am e407bff4: am 3be35a39: Remove some unused resources and imports
* commit '9d56714eb93a9d3639f266fe4b94c3ff31efcc65':
|
| cedda7f660df9b8888a05514b5eb6aad7139f822 |
23-Jun-2014 |
Baligh Uddin <baligh@google.com> |
am 7d10fb4a: (-s ours) am 328b133b: (-s ours) Import translations. DO NOT MERGE
* commit '7d10fb4af180be90783632cc6ada13c533e85515':
|
| 38ee00b4785d4b1d99d265d9b3ee976f5c0c07c9 |
23-Jun-2014 |
Jay Shrauner <shrauner@google.com> |
am 89841816: am efb76c30: am 6b425b5e: am 30d26326: Add directory photo support
* commit '89841816e67c858a6c8dfb670ac8f5ef1e4d052b':
|
| f9c1a70d2e528f9ce9e3849f78e6ca4861bb2dfe |
23-Jun-2014 |
Baligh Uddin <baligh@google.com> |
am 87ff23f3: (-s ours) am 3e6f65be: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '87ff23f3f5338518c607f47e347a384738ca6595':
|
| 2635a3fcc37ee5a2b33ff2a1f593247b9f7fa4c0 |
23-Jun-2014 |
Jay Shrauner <shrauner@google.com> |
am f101fd7d: am 289d819c: am 30d26326: Add directory photo support
* commit 'f101fd7d198036b7e9f9015c93cbf005d0771ccb':
|
| b30d2c670f1262f0d60181e40dad33f2151fee4a |
19-Jun-2014 |
Sol Boucher <solb@google.com> |
camera2-portability: Remove Camera.CameraInfo accessor
This removes the CameraDevice#getCameraInfos() call that provided direct access
to this API 1 type, replacing it with another accessor returning individual
instances of the new wrapper type CameraDevice.BasicCharacteristics .
It also gives CameraProxy a method for getting instances of this wrapper.
Change-Id: I0c72ffe71817b8acf1cc5a01f1565ec4e0e97e7d
amera2/portability/src/com/android/ex/camera2/portability/AndroidCameraAgentImpl.java
amera2/portability/src/com/android/ex/camera2/portability/CameraAgent.java
amera2/portability/src/com/android/ex/camera2/portability/CameraDeviceInfo.java
|
| 5fc3d12227e39adc37f8f9f333d34ac3e20f0fd2 |
20-Jun-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: I22572a812a8337792bf521aec68d3ac1cc2a2400
Auto-generated-cl: translation import
hips/sample/res/values-af/strings.xml
hips/sample/res/values-am/strings.xml
hips/sample/res/values-ar/strings.xml
hips/sample/res/values-bg/strings.xml
hips/sample/res/values-ca/strings.xml
hips/sample/res/values-en-rGB/strings.xml
hips/sample/res/values-en-rIN/strings.xml
hips/sample/res/values-et-rEE/strings.xml
hips/sample/res/values-fa/strings.xml
hips/sample/res/values-fi/strings.xml
hips/sample/res/values-fr-rCA/strings.xml
hips/sample/res/values-hi/strings.xml
hips/sample/res/values-hr/strings.xml
hips/sample/res/values-hu/strings.xml
hips/sample/res/values-hy-rAM/strings.xml
hips/sample/res/values-in/strings.xml
hips/sample/res/values-iw/strings.xml
hips/sample/res/values-ka-rGE/strings.xml
hips/sample/res/values-km-rKH/strings.xml
hips/sample/res/values-lo-rLA/strings.xml
hips/sample/res/values-lt/strings.xml
hips/sample/res/values-lv/strings.xml
hips/sample/res/values-mn-rMN/strings.xml
hips/sample/res/values-ms-rMY/strings.xml
hips/sample/res/values-ro/strings.xml
hips/sample/res/values-sk/strings.xml
hips/sample/res/values-sl/strings.xml
hips/sample/res/values-sr/strings.xml
hips/sample/res/values-sv/strings.xml
hips/sample/res/values-sw/strings.xml
hips/sample/res/values-th/strings.xml
hips/sample/res/values-tl/strings.xml
hips/sample/res/values-uk/strings.xml
hips/sample/res/values-vi/strings.xml
hips/sample/res/values-zh-rHK/strings.xml
hips/sample/res/values-zu/strings.xml
|
| 01e7c02174ef268b6d6daaa5a5bb4f752d55964c |
18-Jun-2014 |
Angus Kong <shkong@google.com> |
Add various supports in settings and capabilities.
1. View angles in capabilities.
2. Preview formats setting.
3. Photo formats setting.
4. Recording hint for video recording preview setting.
5. JPEG thumbnail size setting.
Change-Id: Ib8e33cf838859ae76a662fffcc496250ad85c203
amera2/portability/src/com/android/ex/camera2/portability/AndroidCameraAgentImpl.java
amera2/portability/src/com/android/ex/camera2/portability/AndroidCameraCapabilities.java
amera2/portability/src/com/android/ex/camera2/portability/AndroidCameraSettings.java
amera2/portability/src/com/android/ex/camera2/portability/CameraAgent.java
amera2/portability/src/com/android/ex/camera2/portability/CameraCapabilities.java
amera2/portability/src/com/android/ex/camera2/portability/CameraSettings.java
|
| d61058f788eae0805bb20c4f68874f0f6caef423 |
18-Jun-2014 |
Sol Boucher <solb@google.com> |
camera2-portability: Fix the rest of the 'Andorid' typo
This resolves build breakage.
Change-Id: I3cab88fdee5f86d183b1307dac714466336fc476
amera2/portability/src/com/android/ex/camera2/portability/CameraAgentFactory.java
|
| 4f425ba476d62b4be7078f2084af37cf306b31c6 |
18-Jun-2014 |
Sol Boucher <solb@google.com> |
camera2-portability: Rename CameraManager to CameraAgent
This resolves a naming clash with a class in the new camera2 framework API.
Change-Id: Id53aa3e0bbe9e9edaa82b0aec695fd835c3d0ef9
amera2/portability/src/com/android/ex/camera2/portability/AndroidCameraAgentImpl.java
amera2/portability/src/com/android/ex/camera2/portability/AndroidCameraManagerImpl.java
amera2/portability/src/com/android/ex/camera2/portability/CameraAgent.java
amera2/portability/src/com/android/ex/camera2/portability/CameraAgentFactory.java
amera2/portability/src/com/android/ex/camera2/portability/CameraManager.java
amera2/portability/src/com/android/ex/camera2/portability/CameraManagerFactory.java
amera2/portability/src/com/android/ex/camera2/portability/CameraStateHolder.java
|
| e224f6688362452a4f9021e54f4a2fdc73dee2c5 |
17-Jun-2014 |
Sol Boucher <solb@google.com> |
Add build file for android-ex-camera2-portability
Change-Id: I5d388402fa2705da3b58595e3a1e4da3f01eef47
amera2/portability/Android.mk
|
| f07afbbde040b9578bc7f188016c3960e8616ab0 |
13-Jun-2014 |
Angus Kong <shkong@google.com> |
Don't pass empty list of areas.
Some devices won't work well if we pass in an empty list of focusing or metering
areas.
Change-Id: Iff6bfd37a7d551b12c43e88cf8d4934472837257
amera2/portability/src/com/android/ex/camera2/portability/AndroidCameraManagerImpl.java
|
| 8097973089420749dcd1ab4974a629c2466b31cc |
11-Jun-2014 |
Angus Kong <shkong@google.com> |
Refactor out Camera.Parameters.
Change-Id: Ibc1ddac509381530e887b7491069e6367e9a6088
amera2/portability/src/com/android/ex/camera2/portability/AndroidCameraCapabilities.java
amera2/portability/src/com/android/ex/camera2/portability/AndroidCameraManagerImpl.java
amera2/portability/src/com/android/ex/camera2/portability/AndroidCameraSettings.java
amera2/portability/src/com/android/ex/camera2/portability/CameraActions.java
amera2/portability/src/com/android/ex/camera2/portability/CameraCapabilities.java
amera2/portability/src/com/android/ex/camera2/portability/CameraManager.java
amera2/portability/src/com/android/ex/camera2/portability/CameraSettings.java
amera2/portability/src/com/android/ex/camera2/portability/Size.java
|
| cef46862d6937bc98bf1a6b087c5daa22b5239f3 |
09-Jun-2014 |
Sol Boucher <solb@google.com> |
Refactor CameraManager hierarchy to support new implementations
This relocates several components of the implementation class
AndroidCameraManagerImpl to higher levels in the inheritence hierarchy, where
they can be reused by other implementations of the CameraManager interface:
- AndroidCameraManager.DispatchThread is moved into its own file
- The core (history-tracking) pieces of CameraManager.CameraHandler are moved
into their own HistoryHandler class, which the former is made to inherit
- The constants defined in AndroidCameraManagerImpl for use in its nested
CameraHandler class are moved into a separate class called CameraActions
- AndroidCameraManagerImpl.CameraStateHolder is moved into its own file
- Those CallbackForward classes that aren't tied to Android's Camera1 API are
moved directly into the CameraManager interface
Change-Id: I5f3e1eb72039a0018ce2277e3ec6289bfa4ccec3
amera2/portability/src/com/android/ex/camera2/portability/AndroidCameraManagerImpl.java
amera2/portability/src/com/android/ex/camera2/portability/CameraActions.java
amera2/portability/src/com/android/ex/camera2/portability/CameraManager.java
amera2/portability/src/com/android/ex/camera2/portability/CameraStateHolder.java
amera2/portability/src/com/android/ex/camera2/portability/DispatchThread.java
amera2/portability/src/com/android/ex/camera2/portability/HistoryHandler.java
|
| da52dbdc5ffc76c1c875229086e91475eb150090 |
24-May-2014 |
Erin Dahlgren <edahlgren@google.com> |
Timeout on wait lock and throw exception to prevent ANR.
Change-Id: I5b0d2b8c0384d32ed0d870e5db6003991524fc38
amera2/portability/src/com/android/ex/camera2/portability/AndroidCameraManagerImpl.java
|
| 7e6c76ef7faf26aa1060b4abc1c65934b4e45338 |
13-May-2014 |
Angus Kong <shkong@google.com> |
Handle error getting camera info.
bug:13877028
Change-Id: Iff0353738de3290244092076b2f955f0d7d57408
amera2/portability/src/com/android/ex/camera2/portability/AndroidCameraManagerImpl.java
amera2/portability/src/com/android/ex/camera2/portability/CameraDeviceInfo.java
amera2/portability/src/com/android/ex/camera2/portability/CameraManager.java
|
| 742beb4e81cfcdfa9d4f7d3252be7be797a1e462 |
12-May-2014 |
Sascha Haeberling <haeberling@google.com> |
Don't use stale parameters for capabilities.
Bug: 14823111
Change-Id: I524de9a6dd774c3aa8b6c47092657d66447565bc
amera2/portability/src/com/android/ex/camera2/portability/AndroidCameraManagerImpl.java
|
| c36e3c983c232dc45ed31f3d8e98d8cdd7ac14ba |
23-Apr-2014 |
Angus Kong <shkong@google.com> |
First Step: CameraCapabilities intead of Parameter
To get rid of Camera.Parameters, we need to provide our own interfaces.
Camera.Parameters actually consists of 2 parts: capabilities and settings. We'll
provide two interfaces and will just use Camera.Parameters inside of
CameraManager implementations.
Change-Id: I53922b6d740835412d74365374a6a0382129564e
amera2/portability/src/com/android/ex/camera2/portability/AndroidCameraCapabilities.java
amera2/portability/src/com/android/ex/camera2/portability/AndroidCameraManagerImpl.java
amera2/portability/src/com/android/ex/camera2/portability/CameraCapabilities.java
amera2/portability/src/com/android/ex/camera2/portability/CameraCapabilitiesFactory.java
amera2/portability/src/com/android/ex/camera2/portability/CameraManager.java
|
| 60520c4df78e595964605cf8acfa21bbafaeba84 |
01-May-2014 |
Angus Kong <shkong@google.com> |
Cancel onResumeTask when the app is paused.
Also change the camera closing conditions to force close all camera before
killing the handler thread.
bug:14190951
bug:14441425
Change-Id: Ic752b0678530b34eb3710bd7796cb17d15452013
amera2/portability/src/com/android/ex/camera2/portability/AndroidCameraManagerImpl.java
amera2/portability/src/com/android/ex/camera2/portability/CameraManager.java
|
| b00b7a67213ee6868eb792b2a63ba0dca888a01f |
25-Apr-2014 |
Angus Kong <shkong@google.com> |
Add history info for camera open failure log.
bug:14365703
Change-Id: I4b2259e12121cac5b8165f5c5dbacf9cb3a936a6
amera2/portability/src/com/android/ex/camera2/portability/AndroidCameraManagerImpl.java
amera2/portability/src/com/android/ex/camera2/portability/CameraManager.java
|
| d3865a20b022f6d54fe7ac052768a7ff0710017f |
26-Apr-2014 |
Doris Liu <tianliu@google.com> |
Bring back video snapshot
Bug: 14220490
Change-Id: Ibf20d169aae9de4eb9c1e2151d9c7335bcf7b3a3
amera2/portability/src/com/android/ex/camera2/portability/AndroidCameraManagerImpl.java
|
| bdaaaf5f0257168590fa8965e4d59b054636e6df |
21-Apr-2014 |
Angus Kong <shkong@google.com> |
Create cameradevice package for camera management.
Change-Id: I73c69a70736b0b0eb0ef069a7876cf75fee91262
amera2/portability/src/com/android/ex/camera2/portability/AndroidCameraManagerImpl.java
amera2/portability/src/com/android/ex/camera2/portability/CameraManager.java
amera2/portability/src/com/android/ex/camera2/portability/CameraManagerFactory.java
|
| f7a80d935f2e40383237ad4c163b85047f95dc9c |
09-Apr-2014 |
Alan Newberger <alann@google.com> |
Add logging override helper
This CL removes compile-time log suppression with a runtim override.
With a runtime override we can custom configure logging with a single
level, not quite as flexible as a boolean per level but should suit
our needs. Compile-time log pruning could be done with proguard if
desired.
Bug: 13737123
Change-Id: I8bdcaca44b4dc5c7eab8ef2f74e5181bcacd2727
amera2/portability/src/com/android/ex/camera2/portability/debug/Log.java
amera2/portability/src/com/android/ex/camera2/portability/debug/LogHelper.java
|
| b52fe84c71ddcf1313c4112393bb4936442d9f13 |
08-Apr-2014 |
Alan Newberger <alann@google.com> |
Replace isDebugging compiletime logging override with runtime property
This CL accomplishes the same goal as the compile-time isDebuggable,
with a runtime property check. This is useful so that we opt in to
logging everything at a given level with one setprop line.
Note that either with this new runtime property or with isDebuggable,
the Log proxy wouldn't log if a particular Configuration value is false,
since that level is instead routed to SILENT_LOGGER.
Bug: 13737123
Change-Id: I78ce629620f420a08a2cc013865847674941fb9b
amera2/portability/src/com/android/ex/camera2/portability/debug/Log.java
|
| 102540727e51003c352e82349c339929a0c4be7e |
29-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
If debug is on, log everything.
Change-Id: I706874c9ea1b03c2fd9f987cda9581f72883c914
amera2/portability/src/com/android/ex/camera2/portability/debug/Log.java
|
| b35ea0d2d494ba7668b0183dfc906cde0708bc55 |
12-Mar-2014 |
Angus Kong <shkong@google.com> |
Use debug.Log instead of android.util.Log.
see http://ag/438423, merge conflicts solved.
1. Change to use com.android.camera.debug.Log instead of android.util.Log.
2. Add DebugCameraProxy to support more detailed debug info.
3. Add CameraErrorCallback in CameraManager.
4. Support posting to a specific handler for CameraErrorCallback.
5. Trim down some TAGs to match the framework tag length limit.
6. Remove some unused codes in CameraSettings.
bug:13324870
Change-Id: I8c20a8a0d11cfd50b6e199b03cbc88d3c4ad2ceb
Conflicts:
src/com/android/camera/data/LocalMediaData.java
src/com/android/camera/data/RotationTask.java
src/com/android/camera/widget/FilmstripView.java
amera2/portability/src/com/android/ex/camera2/portability/debug/Log.java
|
| 653cc72d040f693e30aa0666b0190ffd226a060c |
09-Aug-2013 |
Angus Kong <shkong@google.com> |
Clean up Gallery codes.
bug:10263696
Change-Id: I3a16dba3aabe52b8103a2c591cfa39907265a263
allerycommon/src/com/android/gallery3d/util/FutureListener.java
|
| f3c3c1febc9de9461b29042fc05de616ed5f4329 |
17-Jul-2013 |
John Reck <jreck@google.com> |
Fix help for GalleryGoogle builds
Bug: 9886976
Change-Id: I23fc78b924f3757f8ab12f84d3a0c97c1adc2333
(cherry picked from commit 7a43c8c3b85d6f9162651d8ed8b3a11a87490824)
rc/com/android/camera/CameraManager.java
rc/com/android/gallery3d/app/SinglePhotoPage.java
rc/com/android/gallery3d/filtershow/colorpicker/RGBListener.java
rc/com/android/gallery3d/filtershow/filters/FilterPoint.java
rc/com/android/gallery3d/ui/OrientationSource.java
rc/com/android/photos/PhotoFragment.java
|
| 53d47e60967af0ba27b74a27352846ed27cc8e30 |
15-Apr-2013 |
Angus Kong <shkong@google.com> |
Use extra copy of parameters for concurrent access
bug:8585306
Change-Id: I21b8915c53508e4820e46b49171149189cb6012e
rc/com/android/camera/CameraManager.java
|
| 77f7c2cdcea4d28e5eda48fc27cbad5d48d63871 |
04-Apr-2013 |
Angus Kong <shkong@google.com> |
Refresh parameters during recording.
bug:8504803
Change-Id: I1a1838a8415ed4eccad8c76c37cd61d667d92d66
rc/com/android/camera/CameraManager.java
|
| fc2ab79b91a4221bc9fffeb86b55f4eeb9a42a8f |
03-Apr-2013 |
Angus Kong <shkong@google.com> |
Don't access mParameters dirty bit in other thread
Change-Id: I067dd56975cc908f29ed7ba419572982c55b2063
rc/com/android/camera/CameraManager.java
|
| abf6adb5b7793cb98776a178b27fe5d3d2b0de78 |
02-Apr-2013 |
Angus Kong <shkong@google.com> |
Make stopPreview synchronous.
bug:8517092
Change-Id: I66d218e206dab8ad8c80f61ca480923a6be0b0b6
rc/com/android/camera/CameraManager.java
|
| e217bb1ba1742f31e4a3480c17f852963b4783cf |
02-Apr-2013 |
Angus Kong <shkong@google.com> |
Handle InterruptedException in waitDone
Dirty bit for mParameters should be set properly if getParameters is not
finished.
bug:8517092
Change-Id: I2259dc978465d23bff9c6852bec4a791f94137d0
rc/com/android/camera/CameraManager.java
|
| 9836df61aeb3fe6af2e5ab13c56b3fc7f0906046 |
01-Apr-2013 |
Angus Kong <shkong@google.com> |
Don't use SynchronousQueue to pass results.
bug:8517092
Change-Id: I0f2084bc1d52f37743559391cd2217275e3d485d
rc/com/android/camera/CameraManager.java
|
| 6dcf0acfe4393c88808a6084b785e807563930ba |
01-Apr-2013 |
Angus Kong <shkong@google.com> |
Fix NPE when reconnecting camera.
bug:8513852
Change-Id: I45150e5519604f695d25c830262c8b6eb363b1d3
rc/com/android/camera/CameraManager.java
|
| 07bb9985081cbc6980e53b73b54edbce928aca1d |
29-Mar-2013 |
Angus Kong <shkong@google.com> |
Make camera releasing synchronous.
bug:8502943
Change-Id: I48d71c07894fefa909db1a78c0dbe9b8f72e5166
rc/com/android/camera/CameraManager.java
|
| 675ba9f711eb1994aa32e3de1db8fd55d8437e1d |
26-Mar-2013 |
Angus Kong <shkong@google.com> |
Make camera calls asynchronous
bug:8438047
Change-Id: I151d5ff85f0fb3646432a64b5841256a1448f101
rc/com/android/camera/CameraManager.java
|
| 29c6802e6b4e91776f2aec9d5d18826b1e709ef6 |
15-Feb-2013 |
John Reck <jreck@google.com> |
Start of photos
Change-Id: Id53dd96d8873e0fe6c2685e07cd7bdc0cde7ea75
rc/com/android/photos/PhotoFragment.java
|
| f51a16d11eeebeafa2bb2237402a763174d8d46b |
15-Feb-2013 |
John Hoford <hoford@google.com> |
refactor to support many filter based on RedEye
Change-Id: I92ff19d8f750f5bf4c188129580e22990874501e
rc/com/android/gallery3d/filtershow/filters/FilterPoint.java
|
| efeb7fd692ae8faf5b88af131ba0f239e47e9738 |
25-Jan-2013 |
John Hoford <google.com> |
add color selection ui to draw
Change-Id: Ie2fa3522141e4f98e2b7f805c1ebe3385083bb02
rc/com/android/gallery3d/filtershow/colorpicker/RGBListener.java
|
| 863e266068642738af9caf5a29782297cf361d3e |
29-Jan-2013 |
Michael Kolb <kolby@google.com> |
Move Camera Java/Native source into Gallery2
Change-Id: I968efe4d656e88a7760d3c0044f65b4adac2ddd1
rc/com/android/camera/CameraManager.java
|
| 0725f6606f82922243edaa5626173d27828a8591 |
05-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
Split PhotoPage into FilmstripPage and SinglePhotoPage
Bug: 7479348
Change-Id: I98f668bd00e2e09bda9d5d9965fdbdaf1b832bfa
rc/com/android/gallery3d/app/SinglePhotoPage.java
|
| efc39a3a83107ec1c0abc4ff1b546226f46b21a0 |
21-Aug-2012 |
Hung-ying Tyan <tyanh@google.com> |
Move ThreadPool to gallerycommon for picasasync and picasastore.
Bug: 7005321
Change-Id: I7ae4bafed141be03bca74772a261c7c2fb3036c4
rc/com/android/gallery3d/util/FutureListener.java
|
| 367257230d1a377dc204513d004b4953bfe5a229 |
08-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Better orientation change handling.
Bug 6451117: Preview location is wrong after rotating the device quickly
Bug 6444303: The preview location is wrong when camera is started upside down on tablet
Bug 6451710: Tap to focus broken in landscape
Change-Id: I12fd57d6618ec5521ccc6efcbf65de57ff2ea3d2
rc/com/android/gallery3d/ui/OrientationSource.java
|
| 72ff3193b0122ab502f9b27ee1f8c77b45132d2b |
17-Aug-2011 |
Owen Lin <owenlin@google.com> |
Initial code for Gallery2.
fix: 5176434
Change-Id: I041e282b9c7b34ceb1db8b033be2b853bb3a992c
rc/com/android/gallery3d/util/FutureListener.java
|
| 02bd35b48f9086f3bfba70abc2443cb10ee8cbdf |
21-Aug-2012 |
Hung-ying Tyan <tyanh@google.com> |
Move ThreadPool to gallerycommon for picasasync and picasastore.
Bug: 7005321
Change-Id: I7ae4bafed141be03bca74772a261c7c2fb3036c4
allerycommon/src/com/android/gallery3d/util/FutureListener.java
|
| 6c30847bee41132cb0d9b69bfd41e34e4839e83c |
18-Jun-2014 |
Jeff Davidson <jpd@google.com> |
Remove unnecessary versions from android-common's build.gradle.
frameworks/ex/common does not stand alone as a gradle project and
should always be inheriting these values from the parent build.
Change-Id: I9ec38573504d84ac6a08d076e45dc60d842463d0
ommon/build.gradle
|
| 374d66ff1de533725132244d18c7be3b6b80052a |
11-Jun-2014 |
Régis Décamps <regisd@google.com> |
am 4edf1e54: am a03388cf: am e53ad9ba: Merge "Let Rfc822Validator validate IEA in Punycode or Unicode." into klp-ub-dev
* commit '4edf1e548cec17a3856f1ac659c08b865ecd7817':
Let Rfc822Validator validate IEA in Punycode or Unicode.
|
| 4edf1e548cec17a3856f1ac659c08b865ecd7817 |
11-Jun-2014 |
Régis Décamps <regisd@google.com> |
am a03388cf: am e53ad9ba: Merge "Let Rfc822Validator validate IEA in Punycode or Unicode." into klp-ub-dev
* commit 'a03388cf9a9bcd78400b6f79aa360a5d1e71c7ac':
Let Rfc822Validator validate IEA in Punycode or Unicode.
|
| a03388cf9a9bcd78400b6f79aa360a5d1e71c7ac |
11-Jun-2014 |
Régis Décamps <regisd@google.com> |
am e53ad9ba: Merge "Let Rfc822Validator validate IEA in Punycode or Unicode." into klp-ub-dev
* commit 'e53ad9ba39c2bf9ddedd2dfbc775eb43658fef6a':
Let Rfc822Validator validate IEA in Punycode or Unicode.
|
| e53ad9ba39c2bf9ddedd2dfbc775eb43658fef6a |
11-Jun-2014 |
Régis Décamps <regisd@google.com> |
Merge "Let Rfc822Validator validate IEA in Punycode or Unicode." into klp-ub-dev
|
| f376e36ec3c4ee377d617a889370d5bb724f895d |
10-Jun-2014 |
Igor Murashkin <iam@google.com> |
am 77b7bbe0: camera2: Add state waiters for the session state listener
* commit '77b7bbe039393c2d8c1107c07c65028886eef252':
camera2: Add state waiters for the session state listener
|
| 77b7bbe039393c2d8c1107c07c65028886eef252 |
05-Jun-2014 |
Igor Murashkin <iam@google.com> |
camera2: Add state waiters for the session state listener
Bug: 15474402
Change-Id: I4ae86166b5ce99a854c754c8ac6d6c23c683b14a
amera2/public/src/com/android/ex/camera2/blocking/BlockingSessionListener.java
amera2/public/src/com/android/ex/camera2/blocking/BlockingStateListener.java
amera2/public/src/com/android/ex/camera2/utils/StateChangeListener.java
amera2/public/src/com/android/ex/camera2/utils/StateWaiter.java
|
| 4c384ab3ae7621e602a95aeac6e527a52bb5598c |
21-May-2014 |
Régis Décamps <regisd@google.com> |
Let Rfc822Validator validate IEA in Punycode or Unicode.
Let Rfc822Validator validator internation email adresses.
The implementation is based on a regular expression.
Fixes:
- b/13364030 ComposeActivity rejects TLD that are Punycode
- ComposeActivity rejects TLD that are Unicode
Improve unit tests:
- Use RFC example domains, instead of potentially existing domains.
- Add unicode punycode internationalized email address.
- Add validity check for email with special characters.
- Add validity check "a..b@example.com" (RFC says dot cannot be succesive but it is allowed by major providers)
- Add invalidity check for "a@b-.com" (domain name cannot end with a dash) ; "john@doe@example.com" (@ must be unique)
- Remove a@b.12 from invalid emails. There is no tld made of numbers, but no spec strictly prohibits it.
Bug: 13364030
Change-Id: I78bc5d696f587753d776020ef1f9feded2065ad0
ommon/java/com/android/common/Rfc822Validator.java
ommon/tests/src/com/android/common/Rfc822ValidatorTest.java
|
| f2a8acf36af8f65dc5473d18d868c5ae26fff542 |
24-May-2014 |
Chris Craik <ccraik@google.com> |
am 754e9257: am 653af875: am 4d2f71e4: Fix framesequence sample app
* commit '754e925727f8cb5e6a581e23cf543fd52b63accf':
Fix framesequence sample app
|
| 754e925727f8cb5e6a581e23cf543fd52b63accf |
24-May-2014 |
Chris Craik <ccraik@google.com> |
am 653af875: am 4d2f71e4: Fix framesequence sample app
* commit '653af875eb97f4bf7616a6c298345fb1177c3823':
Fix framesequence sample app
|
| 653af875eb97f4bf7616a6c298345fb1177c3823 |
24-May-2014 |
Chris Craik <ccraik@google.com> |
am 4d2f71e4: Fix framesequence sample app
* commit '4d2f71e46622169d54b799d85f659420bf2defc1':
Fix framesequence sample app
|
| 4d2f71e46622169d54b799d85f659420bf2defc1 |
24-May-2014 |
Chris Craik <ccraik@google.com> |
Fix framesequence sample app
Change-Id: I17e997e7240c45a967b258091b8dc1ad9021ae78
ramesequence/samples/RastermillSamples/src/com/android/rastermill/samples/AnimatedGifTest.java
|
| 00a9b46b5a85c2e7ff03d94e517f732d397eb020 |
20-May-2014 |
Igor Murashkin <iam@google.com> |
camera2: Update code for CameraMetadata.Key refactor
Bug: 15091017
Change-Id: Ic56c54c0d184e209e20de374dc8a6d79527c209f
amera2/public/src/com/android/ex/camera2/pos/AutoFocusStateMachine.java
|
| 9d58a3d52bdda449be97e721fcb4c4a3ad12d3ae |
16-May-2014 |
Jeff Hamilton <jham@android.com> |
Update sdk and build tools versions
Change-Id: I713e6b2bf9643ecf446f6e5d2a1f314b8923f5e6
ommon/build.gradle
|
| a1443de26fb9520cac180ef0add5c54e9780be48 |
08-May-2014 |
Ying Wang <wangying@google.com> |
am 53691ed1: am 3696df84: am 552866a9: Merge "Remove unused LOCAL_LDLIBS."
* commit '53691ed19b435c307ea0febd2be8e4dd77c43743':
Remove unused LOCAL_LDLIBS.
|
| 53691ed19b435c307ea0febd2be8e4dd77c43743 |
08-May-2014 |
Ying Wang <wangying@google.com> |
am 3696df84: am 552866a9: Merge "Remove unused LOCAL_LDLIBS."
* commit '3696df848aa7c574f913c97c3bf415b634934048':
Remove unused LOCAL_LDLIBS.
|
| 3696df848aa7c574f913c97c3bf415b634934048 |
08-May-2014 |
Ying Wang <wangying@google.com> |
am 552866a9: Merge "Remove unused LOCAL_LDLIBS."
* commit '552866a940b27ca5b199846201650c61adc7e466':
Remove unused LOCAL_LDLIBS.
|
| 552866a940b27ca5b199846201650c61adc7e466 |
08-May-2014 |
Ying Wang <wangying@google.com> |
Merge "Remove unused LOCAL_LDLIBS."
|
| 0e298c7c189e01412103e0d94c2dbffc98caf05b |
08-May-2014 |
Ying Wang <wangying@google.com> |
Remove unused LOCAL_LDLIBS.
Change-Id: Ib380f4b91df6a01e666c9b9eef2d93d93c043fc0
ariablespeed/jni/Android.mk
|
| a96e4ab1ec2b1a7b545699335608d671a5f1c673 |
30-Apr-2014 |
Dianne Hackborn <hackbod@google.com> |
Pending thumbnails are going away.
Change-Id: I27a990d7f46fb95667931327bfc2f48b2c40e5b3
arousel/test/src/com/android/carouseltest/TaskSwitcherActivity.java
|
| cde4f5160ff095ded46d08f728f6131503e75009 |
30-Apr-2014 |
Scott Kennedy <skennedy@google.com> |
am c7c98e44: am 51b15c3c: am 194dda10: Fix some warnings
* commit 'c7c98e445ecea4559dd07a97a7b6a430b5174235':
|
| c43f58646b9826ec3fd7992a9b72cb6bd1f60ef6 |
30-Apr-2014 |
Tony Mantler <nicoya@google.com> |
am 824a5064: am c9bd3f43: am 5d92cc5c: Call super.onAttached/onDetachedFromWindow
* commit '824a5064c92624d7d91fc1e61074a714f7a7f685':
|
| 653306c0f00ba61398f2c6748df880a1514a12cd |
30-Apr-2014 |
Narayan Kamath <narayan@google.com> |
am e9c4ed6d: am 926d2878: am 56bab444: Merge "AArch64: Fix GetChannelCount() declaration."
* commit 'e9c4ed6d352a3a1e74dbefe8e3f51e255d62b148':
|
| 913299f11270e25f7f7423bfaedb3b2dfc187c4d |
30-Apr-2014 |
Narayan Kamath <narayan@google.com> |
am d6d56dd7: am 2a535d75: am 9ddd5eeb: Merge "AArch64: Minor JNI type changes"
* commit 'd6d56dd71c366455d22f6784465b6a206f2bc4bf':
|
| bb6a25422cc037d2c372e864bb712dabc460fc61 |
30-Apr-2014 |
Jay Shrauner <shrauner@google.com> |
am c8c2ad85: (-s ours) am bdd65f5e: (-s ours) am 38ae6989: am ce2b95ae: Fix AudioEngine to allow re-initialization - DO NOT MERGE
* commit 'c8c2ad85474da63f5d70669b223f7a69f204956d':
|
| c7c98e445ecea4559dd07a97a7b6a430b5174235 |
30-Apr-2014 |
Scott Kennedy <skennedy@google.com> |
am 51b15c3c: am 194dda10: Fix some warnings
* commit '51b15c3cc6a3d0610651e093c4ae5222ec8e0775':
|
| 824a5064c92624d7d91fc1e61074a714f7a7f685 |
30-Apr-2014 |
Tony Mantler <nicoya@google.com> |
am c9bd3f43: am 5d92cc5c: Call super.onAttached/onDetachedFromWindow
* commit 'c9bd3f43197aab6c229b61559948d1bec9a16a19':
|
| e9c4ed6d352a3a1e74dbefe8e3f51e255d62b148 |
30-Apr-2014 |
Narayan Kamath <narayan@google.com> |
am 926d2878: am 56bab444: Merge "AArch64: Fix GetChannelCount() declaration."
* commit '926d2878d40940b3bc1ac013d425296b1e237b41':
|
| d6d56dd71c366455d22f6784465b6a206f2bc4bf |
30-Apr-2014 |
Narayan Kamath <narayan@google.com> |
am 2a535d75: am 9ddd5eeb: Merge "AArch64: Minor JNI type changes"
* commit '2a535d755db5c365041625cfda4e533c93899d60':
|
| c8c2ad85474da63f5d70669b223f7a69f204956d |
30-Apr-2014 |
Jay Shrauner <shrauner@google.com> |
am bdd65f5e: (-s ours) am 38ae6989: am ce2b95ae: Fix AudioEngine to allow re-initialization - DO NOT MERGE
* commit 'bdd65f5e49719431e35398738b81e6d9feb05eb7':
|
| 25e5dbe78295353bdbc574130c03db2d8b014452 |
24-Apr-2014 |
Justin Morey <jmorey@google.com> |
Make logtags an official buildSrc plugin
Change-Id: I4390ac85d03bd5293af3e21aae1bd4750486d610
ommon/build.gradle
|
| 4d33c40a72f63f297d7ba456146d36e185e15114 |
24-Apr-2014 |
Chris Craik <ccraik@google.com> |
am 58a06c82: am 1ad66c1f: am 4eb541af: Store BitmapProvider within FrameSequenceDrawable
* commit '58a06c828b14d65bf01a378cacc6a00dc485bd52':
Store BitmapProvider within FrameSequenceDrawable
|
| 58a06c828b14d65bf01a378cacc6a00dc485bd52 |
24-Apr-2014 |
Chris Craik <ccraik@google.com> |
am 1ad66c1f: am 4eb541af: Store BitmapProvider within FrameSequenceDrawable
* commit '1ad66c1f165ad605a3465cce8445a6bbd59035da':
Store BitmapProvider within FrameSequenceDrawable
|
| 1ad66c1f165ad605a3465cce8445a6bbd59035da |
24-Apr-2014 |
Chris Craik <ccraik@google.com> |
am 4eb541af: Store BitmapProvider within FrameSequenceDrawable
* commit '4eb541aff092a057b27b917f09d33aba226dffed':
Store BitmapProvider within FrameSequenceDrawable
|
| 4eb541aff092a057b27b917f09d33aba226dffed |
24-Apr-2014 |
Chris Craik <ccraik@google.com> |
Store BitmapProvider within FrameSequenceDrawable
Change-Id: Ifd10c796cc6107b33e7bc67835e16ad3c0851953
ramesequence/samples/RastermillSamples/src/com/android/rastermill/samples/AnimatedGifTest.java
ramesequence/src/android/support/rastermill/FrameSequence.java
ramesequence/src/android/support/rastermill/FrameSequenceDrawable.java
|
| 5600a1fa9d05dae0facd36842874a8c014cb9edd |
23-Apr-2014 |
Baligh Uddin <baligh@google.com> |
am 128b4e0b: (-s ours) am c318e2f9: (-s ours) Import translations. DO NOT MERGE
* commit '128b4e0b27bb9af21564c9085dc6a1335c7d77a4':
Import translations. DO NOT MERGE
|
| 128b4e0b27bb9af21564c9085dc6a1335c7d77a4 |
23-Apr-2014 |
Baligh Uddin <baligh@google.com> |
am c318e2f9: (-s ours) Import translations. DO NOT MERGE
* commit 'c318e2f96a7b4cbfe51820a14a10e98f6b5e7686':
Import translations. DO NOT MERGE
|
| c318e2f96a7b4cbfe51820a14a10e98f6b5e7686 |
23-Apr-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: I14e3b9b66ecf903546599ddd2aa0362a73866c3b
Auto-generated-cl: translation import
arousel/test/res/values-am/strings.xml
arousel/test/res/values-ca/strings.xml
arousel/test/res/values-en-rIN/strings.xml
arousel/test/res/values-et-rEE/strings.xml
arousel/test/res/values-fr-rCA/strings.xml
arousel/test/res/values-hy-rAM/strings.xml
arousel/test/res/values-iw/strings.xml
arousel/test/res/values-ka-rGE/strings.xml
arousel/test/res/values-km-rKH/strings.xml
arousel/test/res/values-lo-rLA/strings.xml
arousel/test/res/values-mn-rMN/strings.xml
arousel/test/res/values-ms-rMY/strings.xml
arousel/test/res/values-nb/strings.xml
arousel/test/res/values-zh-rHK/strings.xml
hips/res/values-en-rIN/strings.xml
hips/res/values-et-rEE/strings.xml
hips/res/values-fr-rCA/strings.xml
hips/res/values-hy-rAM/strings.xml
hips/res/values-ka-rGE/strings.xml
hips/res/values-km-rKH/strings.xml
hips/res/values-lo-rLA/strings.xml
hips/res/values-mn-rMN/strings.xml
hips/res/values-ms-rMY/strings.xml
hips/res/values-sr/strings.xml
hips/res/values-zh-rHK/strings.xml
hips/sample/res/values-af/strings.xml
hips/sample/res/values-am/strings.xml
hips/sample/res/values-ar/strings.xml
hips/sample/res/values-bg/strings.xml
hips/sample/res/values-ca/strings.xml
hips/sample/res/values-cs/strings.xml
hips/sample/res/values-da/strings.xml
hips/sample/res/values-de/strings.xml
hips/sample/res/values-el/strings.xml
hips/sample/res/values-en-rGB/strings.xml
hips/sample/res/values-en-rIN/strings.xml
hips/sample/res/values-es-rUS/strings.xml
hips/sample/res/values-es/strings.xml
hips/sample/res/values-et-rEE/strings.xml
hips/sample/res/values-fa/strings.xml
hips/sample/res/values-fi/strings.xml
hips/sample/res/values-fr-rCA/strings.xml
hips/sample/res/values-fr/strings.xml
hips/sample/res/values-hi/strings.xml
hips/sample/res/values-hr/strings.xml
hips/sample/res/values-hu/strings.xml
hips/sample/res/values-hy-rAM/strings.xml
hips/sample/res/values-in/strings.xml
hips/sample/res/values-it/strings.xml
hips/sample/res/values-iw/strings.xml
hips/sample/res/values-ja/strings.xml
hips/sample/res/values-ka-rGE/strings.xml
hips/sample/res/values-km-rKH/strings.xml
hips/sample/res/values-ko/strings.xml
hips/sample/res/values-lo-rLA/strings.xml
hips/sample/res/values-lt/strings.xml
hips/sample/res/values-lv/strings.xml
hips/sample/res/values-mn-rMN/strings.xml
hips/sample/res/values-ms-rMY/strings.xml
hips/sample/res/values-nb/strings.xml
hips/sample/res/values-nl/strings.xml
hips/sample/res/values-pl/strings.xml
hips/sample/res/values-pt-rPT/strings.xml
hips/sample/res/values-pt/strings.xml
hips/sample/res/values-ro/strings.xml
hips/sample/res/values-ru/strings.xml
hips/sample/res/values-sk/strings.xml
hips/sample/res/values-sl/strings.xml
hips/sample/res/values-sr/strings.xml
hips/sample/res/values-sv/strings.xml
hips/sample/res/values-sw/strings.xml
hips/sample/res/values-th/strings.xml
hips/sample/res/values-tl/strings.xml
hips/sample/res/values-tr/strings.xml
hips/sample/res/values-uk/strings.xml
hips/sample/res/values-vi/strings.xml
hips/sample/res/values-zh-rCN/strings.xml
hips/sample/res/values-zh-rHK/strings.xml
hips/sample/res/values-zh-rTW/strings.xml
hips/sample/res/values-zu/strings.xml
|
| 5c08d39a78f5a025a45b584510edf11449be5e85 |
18-Apr-2014 |
Chris Craik <ccraik@google.com> |
am f1da553f: am ac356377: am 3105099a: Add Bitmap reuse callbacks to FrameSequenceDrawable
* commit 'f1da553f9a7b42ed0e9e9a473ab022787b476c6c':
Add Bitmap reuse callbacks to FrameSequenceDrawable
|
| f1da553f9a7b42ed0e9e9a473ab022787b476c6c |
18-Apr-2014 |
Chris Craik <ccraik@google.com> |
am ac356377: am 3105099a: Add Bitmap reuse callbacks to FrameSequenceDrawable
* commit 'ac3563777d4be7c4610bd8b44190f65e754bce9c':
Add Bitmap reuse callbacks to FrameSequenceDrawable
|
| ac3563777d4be7c4610bd8b44190f65e754bce9c |
18-Apr-2014 |
Chris Craik <ccraik@google.com> |
am 3105099a: Add Bitmap reuse callbacks to FrameSequenceDrawable
* commit '3105099a73d4fea3408ea0cf6b358fff77dc8b67':
Add Bitmap reuse callbacks to FrameSequenceDrawable
|
| edf9b83e5df6e178e5bce7ffb0fe6ff0c9248a7c |
18-Apr-2014 |
Urvang Joshi <urvang@google.com> |
GIF decode: rectify loop count extraction
Left-shift was missing earlier.
An example affected image: https://x20web.corp.google.com/~urvang/anim3/images/anim_icc.gif
Earlier code would have set mLoopCount to 125, while correct value is 32000.
Confirmed with ImageMagick:
identify -verbose anim_icc.gif | grep 'Iterations'
Iterations: 32000
Change-Id: I3fc9cc2febd0cc4f51c80ccf7ddcd98723881214
ramesequence/jni/FrameSequence_gif.cpp
|
| 3105099a73d4fea3408ea0cf6b358fff77dc8b67 |
16-Apr-2014 |
Chris Craik <ccraik@google.com> |
Add Bitmap reuse callbacks to FrameSequenceDrawable
Also fixes decoding thread priority, and now correctly handles
unscheduled swap events.
Change-Id: I8397a390ff5d0cbbd5f2f07ab18973fb821c881d
ramesequence/samples/RastermillSamples/src/com/android/rastermill/samples/AnimatedGifTest.java
ramesequence/src/android/support/rastermill/FrameSequenceDrawable.java
|
| ed900eafd6d38cddd01e31eb282165208e8c9171 |
10-Apr-2014 |
Chris Craik <ccraik@google.com> |
am c310ea10: am cd492ad1: am 9d34bc31: Fix uninitialized read in gif extension reading
* commit 'c310ea102fcf14540742007361d8f51f05d6affe':
Fix uninitialized read in gif extension reading
|
| c310ea102fcf14540742007361d8f51f05d6affe |
10-Apr-2014 |
Chris Craik <ccraik@google.com> |
am cd492ad1: am 9d34bc31: Fix uninitialized read in gif extension reading
* commit 'cd492ad17514910064aaff1d17741cb5bbb69f0b':
Fix uninitialized read in gif extension reading
|
| cd492ad17514910064aaff1d17741cb5bbb69f0b |
10-Apr-2014 |
Chris Craik <ccraik@google.com> |
am 9d34bc31: Fix uninitialized read in gif extension reading
* commit '9d34bc31927f47e91ba85980d4d146593cbbe1a8':
Fix uninitialized read in gif extension reading
|
| 9d34bc31927f47e91ba85980d4d146593cbbe1a8 |
10-Apr-2014 |
Chris Craik <ccraik@google.com> |
Fix uninitialized read in gif extension reading
Use memcmp instead of strcmp, since string stored in gif may not be
null terminated.
Additionally, pass the correct carray for releasing the byte array.
Change-Id: Icb0260c953377d17b7dd7b4fb021147181cd5df8
ramesequence/jni/FrameSequenceJNI.cpp
ramesequence/jni/FrameSequence_gif.cpp
|
| 4fbb1a29d3ca05199561acb9036a8e9c1aed72c0 |
08-Apr-2014 |
Urvang Joshi <urvang@google.com> |
Remove an obsolete TODO from earlier
Change-Id: I1bcaec09135d04ba1a57f3a647fca1c332931236
ramesequence/jni/FrameSequence_webp.h
|
| 9b38510c08561d2c71cc2aa2ea5432e46d27e82f |
04-Apr-2014 |
Urvang Joshi <urvang@google.com> |
Animated WebP decoder: rectify post-processing when disposing to background.
See the corresponding (correct) logic on Chrome side:
https://code.google.com/p/chromium/codesearch#chromium/src/third_party/WebKit/Source/platform/image-decoders/webp/WEBPImageDecoder.cpp&l=446
Change-Id: Ife17e24b3263ff6148ffc38849c5e3527d341945
ramesequence/jni/FrameSequence_webp.cpp
|
| 0b0cefbe9f1e37e3d2300909792d1263545a7521 |
26-Mar-2014 |
Scott Kennedy <skennedy@google.com> |
Remove chips from frameworks/ex
It's now its own project in frameworks/opt/chips
Change-Id: I0fc5731e3eaff21b5b026746f91b9cdace90f214
hips/Android.mk
hips/AndroidManifest.xml
hips/project.properties
hips/res/drawable-hdpi/chip_background.9.png
hips/res/drawable-hdpi/chip_background_invalid.9.png
hips/res/drawable-hdpi/chip_background_selected.9.png
hips/res/drawable-hdpi/chip_delete.png
hips/res/drawable-hdpi/ic_contact_picture.png
hips/res/drawable-mdpi/chip_background.9.png
hips/res/drawable-mdpi/chip_background_invalid.9.png
hips/res/drawable-mdpi/chip_background_selected.9.png
hips/res/drawable-mdpi/chip_delete.png
hips/res/drawable-mdpi/ic_contact_picture.png
hips/res/drawable-xhdpi/chip_background.9.png
hips/res/drawable-xhdpi/chip_background_invalid.9.png
hips/res/drawable-xhdpi/chip_background_selected.9.png
hips/res/drawable-xhdpi/ic_contact_picture.png
hips/res/drawable/list_item_font_primary.xml
hips/res/drawable/list_item_font_secondary.xml
hips/res/layout/chips_alternate_item.xml
hips/res/layout/chips_recipient_dropdown_item.xml
hips/res/layout/copy_chip_dialog_layout.xml
hips/res/layout/more_item.xml
hips/res/values-af/strings.xml
hips/res/values-am/strings.xml
hips/res/values-ar/strings.xml
hips/res/values-az-rAZ/strings.xml
hips/res/values-az/strings.xml
hips/res/values-bg/strings.xml
hips/res/values-ca/strings.xml
hips/res/values-cs/strings.xml
hips/res/values-da/strings.xml
hips/res/values-de/strings.xml
hips/res/values-el/strings.xml
hips/res/values-en-rGB/strings.xml
hips/res/values-en-rIN/strings.xml
hips/res/values-es-rUS/strings.xml
hips/res/values-es/strings.xml
hips/res/values-et-rEE/strings.xml
hips/res/values-fa/strings.xml
hips/res/values-fi/strings.xml
hips/res/values-fr-rCA/strings.xml
hips/res/values-fr/strings.xml
hips/res/values-hi/strings.xml
hips/res/values-hr/strings.xml
hips/res/values-hu/strings.xml
hips/res/values-hy-rAM/strings.xml
hips/res/values-in/strings.xml
hips/res/values-it/strings.xml
hips/res/values-iw/strings.xml
hips/res/values-ja/strings.xml
hips/res/values-ka-rGE/strings.xml
hips/res/values-km-rKH/strings.xml
hips/res/values-ko/strings.xml
hips/res/values-land/dimen.xml
hips/res/values-lo-rLA/strings.xml
hips/res/values-lt/strings.xml
hips/res/values-lv/strings.xml
hips/res/values-mn-rMN/strings.xml
hips/res/values-ms-rMY/strings.xml
hips/res/values-nb/strings.xml
hips/res/values-ne-rNP/strings.xml
hips/res/values-ne/strings.xml
hips/res/values-nl/strings.xml
hips/res/values-pl/strings.xml
hips/res/values-pt-rPT/strings.xml
hips/res/values-pt/strings.xml
hips/res/values-ro/strings.xml
hips/res/values-ru/strings.xml
hips/res/values-si-rLK/strings.xml
hips/res/values-si/strings.xml
hips/res/values-sk/strings.xml
hips/res/values-sl/strings.xml
hips/res/values-sr/strings.xml
hips/res/values-sv/strings.xml
hips/res/values-sw/strings.xml
hips/res/values-sw600dp-land/dimen.xml
hips/res/values-sw600dp/styles.xml
hips/res/values-th/strings.xml
hips/res/values-tl/strings.xml
hips/res/values-tr/strings.xml
hips/res/values-uk/strings.xml
hips/res/values-v17/styles-v17.xml
hips/res/values-vi/strings.xml
hips/res/values-zh-rCN/strings.xml
hips/res/values-zh-rHK/strings.xml
hips/res/values-zh-rTW/strings.xml
hips/res/values-zu/strings.xml
hips/res/values/attrs.xml
hips/res/values/dimen.xml
hips/res/values/strings.xml
hips/res/values/styles.xml
hips/sample/Android.mk
hips/sample/AndroidManifest.xml
hips/sample/res/drawable-hdpi/ic_launcher.png
hips/sample/res/drawable-mdpi/ic_launcher.png
hips/sample/res/drawable-xhdpi/ic_launcher.png
hips/sample/res/layout/activity_main.xml
hips/sample/res/values-af/strings.xml
hips/sample/res/values-am/strings.xml
hips/sample/res/values-ar/strings.xml
hips/sample/res/values-bg/strings.xml
hips/sample/res/values-ca/strings.xml
hips/sample/res/values-cs/strings.xml
hips/sample/res/values-da/strings.xml
hips/sample/res/values-de/strings.xml
hips/sample/res/values-el/strings.xml
hips/sample/res/values-en-rGB/strings.xml
hips/sample/res/values-en-rIN/strings.xml
hips/sample/res/values-es-rUS/strings.xml
hips/sample/res/values-es/strings.xml
hips/sample/res/values-et-rEE/strings.xml
hips/sample/res/values-fa/strings.xml
hips/sample/res/values-fi/strings.xml
hips/sample/res/values-fr-rCA/strings.xml
hips/sample/res/values-fr/strings.xml
hips/sample/res/values-hi/strings.xml
hips/sample/res/values-hr/strings.xml
hips/sample/res/values-hu/strings.xml
hips/sample/res/values-hy-rAM/strings.xml
hips/sample/res/values-in/strings.xml
hips/sample/res/values-it/strings.xml
hips/sample/res/values-iw/strings.xml
hips/sample/res/values-ja/strings.xml
hips/sample/res/values-ka-rGE/strings.xml
hips/sample/res/values-km-rKH/strings.xml
hips/sample/res/values-ko/strings.xml
hips/sample/res/values-lo-rLA/strings.xml
hips/sample/res/values-lt/strings.xml
hips/sample/res/values-lv/strings.xml
hips/sample/res/values-mn-rMN/strings.xml
hips/sample/res/values-ms-rMY/strings.xml
hips/sample/res/values-nb/strings.xml
hips/sample/res/values-nl/strings.xml
hips/sample/res/values-pl/strings.xml
hips/sample/res/values-pt-rPT/strings.xml
hips/sample/res/values-pt/strings.xml
hips/sample/res/values-ro/strings.xml
hips/sample/res/values-ru/strings.xml
hips/sample/res/values-sk/strings.xml
hips/sample/res/values-sl/strings.xml
hips/sample/res/values-sr/strings.xml
hips/sample/res/values-sv/strings.xml
hips/sample/res/values-sw/strings.xml
hips/sample/res/values-th/strings.xml
hips/sample/res/values-tl/strings.xml
hips/sample/res/values-tr/strings.xml
hips/sample/res/values-uk/strings.xml
hips/sample/res/values-vi/strings.xml
hips/sample/res/values-zh-rCN/strings.xml
hips/sample/res/values-zh-rHK/strings.xml
hips/sample/res/values-zh-rTW/strings.xml
hips/sample/res/values-zu/strings.xml
hips/sample/res/values/strings.xml
hips/sample/src/com/android/ex/chips/sample/MainActivity.java
hips/src/com/android/ex/chips/AccountSpecifier.java
hips/src/com/android/ex/chips/BaseRecipientAdapter.java
hips/src/com/android/ex/chips/ChipsUtil.java
hips/src/com/android/ex/chips/DropdownChipLayouter.java
hips/src/com/android/ex/chips/Queries.java
hips/src/com/android/ex/chips/RecipientAlternatesAdapter.java
hips/src/com/android/ex/chips/RecipientEditTextView.java
hips/src/com/android/ex/chips/RecipientEntry.java
hips/src/com/android/ex/chips/SingleRecipientArrayAdapter.java
hips/src/com/android/ex/chips/recipientchip/BaseRecipientChip.java
hips/src/com/android/ex/chips/recipientchip/DrawableRecipientChip.java
hips/src/com/android/ex/chips/recipientchip/InvisibleRecipientChip.java
hips/src/com/android/ex/chips/recipientchip/SimpleRecipientChip.java
hips/src/com/android/ex/chips/recipientchip/VisibleRecipientChip.java
hips/tests/Android.mk
hips/tests/AndroidManifest.xml
hips/tests/src/com/android/ex/chips/ChipsTest.java
hips/tests/src/com/android/ex/chips/RecipientAlternatesAdapterTest.java
|
| b468c8fc7e914220c457e390b23a54baee1a1c69 |
25-Mar-2014 |
Scott Kennedy <skennedy@google.com> |
am 92591524: am e0b5c555: am 49f3ffd3: am 194dda10: Fix some warnings
* commit '92591524182a086e666f66e087032a646a27d20e':
Fix some warnings
|
| 92591524182a086e666f66e087032a646a27d20e |
25-Mar-2014 |
Scott Kennedy <skennedy@google.com> |
am e0b5c555: am 49f3ffd3: am 194dda10: Fix some warnings
* commit 'e0b5c5557f713c69d50de6137922f9e3d0c8fc43':
Fix some warnings
|
| e0b5c5557f713c69d50de6137922f9e3d0c8fc43 |
25-Mar-2014 |
Scott Kennedy <skennedy@google.com> |
am 49f3ffd3: am 194dda10: Fix some warnings
* commit '49f3ffd31e8fddcc90674dfd3857041cf22df1e7':
Fix some warnings
|
| 49f3ffd31e8fddcc90674dfd3857041cf22df1e7 |
25-Mar-2014 |
Scott Kennedy <skennedy@google.com> |
am 194dda10: Fix some warnings
* commit '194dda102240aeeaa30c28f4eda3e1d3ccdb6b03':
Fix some warnings
|
| 51b15c3cc6a3d0610651e093c4ae5222ec8e0775 |
25-Mar-2014 |
Scott Kennedy <skennedy@google.com> |
am 194dda10: Fix some warnings
* commit '194dda102240aeeaa30c28f4eda3e1d3ccdb6b03':
Fix some warnings
|
| 194dda102240aeeaa30c28f4eda3e1d3ccdb6b03 |
25-Mar-2014 |
Scott Kennedy <skennedy@google.com> |
Fix some warnings
Change-Id: I43b3b9e5d6ecf4f5ca46da2cfe8d07e2d647355e
ommon/java/com/android/common/NetworkConnectivityListener.java
|
| 2a2ff6ed0db11be779f55462ec30e60154db8e3d |
19-Mar-2014 |
Chris Craik <ccraik@google.com> |
Merge "Add Animated WebP support in RasterMill"
|
| bbeed6726cd11a0285a59225605c4ae33ee25257 |
17-Mar-2014 |
John Reck <jreck@google.com> |
Merge "Fix ALOG_ASSERT"
|
| b34f1da83570613bb349f8026d4325552ac495ed |
21-Feb-2014 |
Urvang Joshi <urvang@google.com> |
Add Animated WebP support in RasterMill
Change-Id: I1f36a8f308534919cd020e2f5484ceca9e255284
ramesequence/jni/Android.mk
ramesequence/jni/FrameSequence_webp.cpp
ramesequence/jni/FrameSequence_webp.h
|
| b5fb6d0f18fed511256fd3aa07bb3eccbbb15f80 |
15-Mar-2014 |
John Reck <jreck@google.com> |
Fix ALOG_ASSERT
Change-Id: I3484aa7b62ad883a94ef68ec2c65841716d85a2c
ramesequence/jni/utils/log.h
|
| e5dfefd454d1ca3467eb7b887f236c226452b51b |
14-Mar-2014 |
Tony Mantler <nicoya@google.com> |
am f28f92f2: am 9fec16d3: am 9d2e3059: am 5d92cc5c: Call super.onAttached/onDetachedFromWindow
* commit 'f28f92f2294be86cee6b0969f2468879bf3f7da5':
Call super.onAttached/onDetachedFromWindow
|
| f28f92f2294be86cee6b0969f2468879bf3f7da5 |
14-Mar-2014 |
Tony Mantler <nicoya@google.com> |
am 9fec16d3: am 9d2e3059: am 5d92cc5c: Call super.onAttached/onDetachedFromWindow
* commit '9fec16d3ebdc798cc67c41034c41c4d894c69210':
Call super.onAttached/onDetachedFromWindow
|
| 9fec16d3ebdc798cc67c41034c41c4d894c69210 |
14-Mar-2014 |
Tony Mantler <nicoya@google.com> |
am 9d2e3059: am 5d92cc5c: Call super.onAttached/onDetachedFromWindow
* commit '9d2e305910a8b680dfb420c659c3c7885487ea7e':
Call super.onAttached/onDetachedFromWindow
|
| 9d2e305910a8b680dfb420c659c3c7885487ea7e |
14-Mar-2014 |
Tony Mantler <nicoya@google.com> |
am 5d92cc5c: Call super.onAttached/onDetachedFromWindow
* commit '5d92cc5c6acae28695a2afba3dd2fbd1f98d890f':
Call super.onAttached/onDetachedFromWindow
|
| c9bd3f43197aab6c229b61559948d1bec9a16a19 |
14-Mar-2014 |
Tony Mantler <nicoya@google.com> |
am 5d92cc5c: Call super.onAttached/onDetachedFromWindow
* commit '5d92cc5c6acae28695a2afba3dd2fbd1f98d890f':
Call super.onAttached/onDetachedFromWindow
|
| 5d92cc5c6acae28695a2afba3dd2fbd1f98d890f |
12-Mar-2014 |
Tony Mantler <nicoya@google.com> |
Call super.onAttached/onDetachedFromWindow
b/13342458
Change-Id: I0c68789c350bb252018691cff7975e0f49f0e10b
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 6a005419e50275062d97711ce8402b5d71940c81 |
08-Mar-2014 |
Igor Murashkin <iam@google.com> |
Merge "camera2: BlockingStateListener invokes proxy before firing state change"
|
| f24f9918f9dc081ccad9871dc174bf3b3e47059a |
08-Mar-2014 |
Igor Murashkin <iam@google.com> |
camera2: BlockingStateListener invokes proxy before firing state change
- This fixes a race condition where it was possible to wait for a state
transition using #waitForState but without yet the corresponding
proxy callback having been fired.
Change-Id: If521c4e48177d4b0fe5ab6fed3d31ddd74b656af
amera2/public/src/com/android/ex/camera2/blocking/BlockingStateListener.java
|
| 926d2878d40940b3bc1ac013d425296b1e237b41 |
07-Mar-2014 |
Narayan Kamath <narayan@google.com> |
am 56bab444: Merge "AArch64: Fix GetChannelCount() declaration."
* commit '56bab444c3bc89bb63aac728f549bd3261d01f6f':
AArch64: Fix GetChannelCount() declaration.
|
| 2a535d755db5c365041625cfda4e533c93899d60 |
07-Mar-2014 |
Narayan Kamath <narayan@google.com> |
am 9ddd5eeb: Merge "AArch64: Minor JNI type changes"
* commit '9ddd5eebd43aeaeb2e5b366b497e7576ca5c3ef9':
AArch64: Minor JNI type changes
|
| f89f55d9dcf65cd655922bc9b64a05fbbafc4626 |
07-Mar-2014 |
Jay Shrauner <shrauner@google.com> |
am c736dbcf: (-s ours) am e4dbcf35: am cf4d2a64: am 38ae6989: (-s ours) am ce2b95ae: Fix AudioEngine to allow re-initialization - DO NOT MERGE
* commit 'c736dbcfc6c33f22bcea990ad38cc2ca0bd5e316':
Fix AudioEngine to allow re-initialization - DO NOT MERGE
|
| c736dbcfc6c33f22bcea990ad38cc2ca0bd5e316 |
06-Mar-2014 |
Jay Shrauner <shrauner@google.com> |
am e4dbcf35: am cf4d2a64: am 38ae6989: (-s ours) am ce2b95ae: Fix AudioEngine to allow re-initialization - DO NOT MERGE
* commit 'e4dbcf35563d35fcf85db40608ffb840b2127b0c':
Fix AudioEngine to allow re-initialization - DO NOT MERGE
|
| e4dbcf35563d35fcf85db40608ffb840b2127b0c |
06-Mar-2014 |
Jay Shrauner <shrauner@google.com> |
am cf4d2a64: am 38ae6989: (-s ours) am ce2b95ae: Fix AudioEngine to allow re-initialization - DO NOT MERGE
* commit 'cf4d2a642fae4c381f7535e1dfb8d7781d5a44fc':
Fix AudioEngine to allow re-initialization - DO NOT MERGE
|
| cf4d2a642fae4c381f7535e1dfb8d7781d5a44fc |
06-Mar-2014 |
Jay Shrauner <shrauner@google.com> |
am 38ae6989: (-s ours) am ce2b95ae: Fix AudioEngine to allow re-initialization - DO NOT MERGE
* commit '38ae6989a72ccdb7e8bb5b0ac99943543abd4883':
Fix AudioEngine to allow re-initialization - DO NOT MERGE
|
| bdd65f5e49719431e35398738b81e6d9feb05eb7 |
06-Mar-2014 |
Jay Shrauner <shrauner@google.com> |
am 38ae6989: am ce2b95ae: Fix AudioEngine to allow re-initialization - DO NOT MERGE
* commit '38ae6989a72ccdb7e8bb5b0ac99943543abd4883':
Fix AudioEngine to allow re-initialization - DO NOT MERGE
|
| 38ae6989a72ccdb7e8bb5b0ac99943543abd4883 |
06-Mar-2014 |
Jay Shrauner <shrauner@google.com> |
am ce2b95ae: Fix AudioEngine to allow re-initialization - DO NOT MERGE
* commit 'ce2b95ae200332495b348be07f77fe60b6c23dcc':
Fix AudioEngine to allow re-initialization - DO NOT MERGE
|
| ce2b95ae200332495b348be07f77fe60b6c23dcc |
26-Feb-2014 |
Jay Shrauner <shrauner@google.com> |
Fix AudioEngine to allow re-initialization - DO NOT MERGE
Add AudioEngine::CompareAndSetEngine and change
VariableSpeed::initializeEngine to use this method so it only initializes
a new engine once rather than asserting on subsequent calls.
Change AudioEngine::DeleteEngine so it ignores repeated calls instead of
asserting. Add VariableSpeed::isReadyToPlay so callers can detect when
the audio library has been properly initialized.
Bug:11511992
Change-Id: I4517cb2ab4c186da43dffc7dbc2a9ad49000059f
(cherry picked from commit 8502b724a9fdc104e7b4a3aba1641e101b4c7be9)
ariablespeed/jni/jni_entry.cc
ariablespeed/jni/variablespeed.cc
ariablespeed/jni/variablespeed.h
ariablespeed/src/com/android/ex/variablespeed/MediaPlayerProxy.java
ariablespeed/src/com/android/ex/variablespeed/SingleThreadedMediaPlayerProxy.java
ariablespeed/src/com/android/ex/variablespeed/VariableSpeed.java
|
| c5da8557f1a26e984b14b9eb64cda2d3d3ba71ce |
06-Mar-2014 |
Jay Shrauner <shrauner@google.com> |
Merge "Fix AudioEngine to allow re-initialization"
|
| 427a1270d2ac5fd53d34aa0f860c9505e2ce4cbe |
05-Mar-2014 |
Mike Schneider <michschn@google.com> |
am d06074aa: am 53e46a8c: am ae8431ea: am 79623848: am c842713d: fix visibility
* commit 'd06074aab6ddc5fb95db2328d3d71798e86d835a':
fix visibility
|
| 4b868ed83ce7db6f6a9f65f6d2bd020ea5f32c8b |
05-Mar-2014 |
Andrew Sapperstein <asapperstein@google.com> |
am 27df5a3a: am 099915f7: am ebf46bcd: am 8eb56a43: am ae908d29: RTL - properly set text alignment and direction.
* commit '27df5a3a62ccd4c7e3621c321bb0f39337b75e29':
RTL - properly set text alignment and direction.
|
| 8502b724a9fdc104e7b4a3aba1641e101b4c7be9 |
26-Feb-2014 |
Jay Shrauner <shrauner@google.com> |
Fix AudioEngine to allow re-initialization
Add AudioEngine::CompareAndSetEngine and change
VariableSpeed::initializeEngine to use this method so it only initializes
a new engine once rather than asserting on subsequent calls.
Change AudioEngine::DeleteEngine so it ignores repeated calls instead of
asserting. Add VariableSpeed::isReadyToPlay so callers can detect when
the audio library has been properly initialized.
Bug:11511992
Change-Id: I4517cb2ab4c186da43dffc7dbc2a9ad49000059f
ariablespeed/jni/jni_entry.cc
ariablespeed/jni/variablespeed.cc
ariablespeed/jni/variablespeed.h
ariablespeed/src/com/android/ex/variablespeed/MediaPlayerProxy.java
ariablespeed/src/com/android/ex/variablespeed/SingleThreadedMediaPlayerProxy.java
ariablespeed/src/com/android/ex/variablespeed/VariableSpeed.java
|
| d06074aab6ddc5fb95db2328d3d71798e86d835a |
05-Mar-2014 |
Mike Schneider <michschn@google.com> |
am 53e46a8c: am ae8431ea: am 79623848: am c842713d: fix visibility
* commit '53e46a8c1645416f29d1c7f2e7369d35f91eabfe':
fix visibility
|
| 27df5a3a62ccd4c7e3621c321bb0f39337b75e29 |
05-Mar-2014 |
Andrew Sapperstein <asapperstein@google.com> |
am 099915f7: am ebf46bcd: am 8eb56a43: am ae908d29: RTL - properly set text alignment and direction.
* commit '099915f755db24f31e347635c2c38a4ffd6f3590':
RTL - properly set text alignment and direction.
|
| 53e46a8c1645416f29d1c7f2e7369d35f91eabfe |
05-Mar-2014 |
Mike Schneider <michschn@google.com> |
am ae8431ea: am 79623848: am c842713d: fix visibility
* commit 'ae8431eafb2a026a59f227afb1cae426c25d3f76':
fix visibility
|
| 099915f755db24f31e347635c2c38a4ffd6f3590 |
05-Mar-2014 |
Andrew Sapperstein <asapperstein@google.com> |
am ebf46bcd: am 8eb56a43: am ae908d29: RTL - properly set text alignment and direction.
* commit 'ebf46bcd212f18c761cf24b5f6a7cd21f8624548':
RTL - properly set text alignment and direction.
|
| ae8431eafb2a026a59f227afb1cae426c25d3f76 |
05-Mar-2014 |
Mike Schneider <michschn@google.com> |
am 79623848: am c842713d: fix visibility
* commit '79623848d825bc2622b791dce8a8ccc84b37527a':
fix visibility
|
| ebf46bcd212f18c761cf24b5f6a7cd21f8624548 |
05-Mar-2014 |
Andrew Sapperstein <asapperstein@google.com> |
am 8eb56a43: am ae908d29: RTL - properly set text alignment and direction.
* commit '8eb56a43fdb583f32b960b8d092a403959a17fcb':
RTL - properly set text alignment and direction.
|
| 79623848d825bc2622b791dce8a8ccc84b37527a |
05-Mar-2014 |
Mike Schneider <michschn@google.com> |
am c842713d: fix visibility
* commit 'c842713d7376e2cd75bacbb6fb22a7648700b4c2':
fix visibility
|
| c842713d7376e2cd75bacbb6fb22a7648700b4c2 |
04-Mar-2014 |
Mike Schneider <michschn@google.com> |
fix visibility
Change-Id: Iabce2e83df084a8bb1312a7e8246bb6fc9818ebd
hips/src/com/android/ex/chips/BaseRecipientAdapter.java
|
| 8eb56a43fdb583f32b960b8d092a403959a17fcb |
05-Mar-2014 |
Andrew Sapperstein <asapperstein@google.com> |
am ae908d29: RTL - properly set text alignment and direction.
* commit 'ae908d2985da811f8285314ad995390a8cfeecaf':
RTL - properly set text alignment and direction.
|
| ae908d2985da811f8285314ad995390a8cfeecaf |
05-Mar-2014 |
Andrew Sapperstein <asapperstein@google.com> |
RTL - properly set text alignment and direction.
Fixes b/12569794.
Change-Id: I5c2bb4195f8073bb7778b98dcf332d3efbffb934
hips/res/values-sw600dp/styles.xml
hips/res/values/styles.xml
|
| 30df46f9e6794df82ad5f762416d6e7fb8e71b89 |
03-Mar-2014 |
Kevin Lin <linkevin@google.com> |
am 8fc3233b: am 3c154ffa: am 3696df98: am 57b5b6fa: am 0c58c370: Fix redrawing chips with recipientEditText onSizeChanged when it has left and right padding.
* commit '8fc3233b233bdfe5f46d87799ad626c4978228dd':
Fix redrawing chips with recipientEditText onSizeChanged when it has left and right padding.
|
| 8fc3233b233bdfe5f46d87799ad626c4978228dd |
03-Mar-2014 |
Kevin Lin <linkevin@google.com> |
am 3c154ffa: am 3696df98: am 57b5b6fa: am 0c58c370: Fix redrawing chips with recipientEditText onSizeChanged when it has left and right padding.
* commit '3c154ffa935d50fa512c4821cbcdfbd5dd43f540':
Fix redrawing chips with recipientEditText onSizeChanged when it has left and right padding.
|
| 3c154ffa935d50fa512c4821cbcdfbd5dd43f540 |
03-Mar-2014 |
Kevin Lin <linkevin@google.com> |
am 3696df98: am 57b5b6fa: am 0c58c370: Fix redrawing chips with recipientEditText onSizeChanged when it has left and right padding.
* commit '3696df98be36185b9f3f638cf3d77f020cc29b2d':
Fix redrawing chips with recipientEditText onSizeChanged when it has left and right padding.
|
| 3696df98be36185b9f3f638cf3d77f020cc29b2d |
03-Mar-2014 |
Kevin Lin <linkevin@google.com> |
am 57b5b6fa: am 0c58c370: Fix redrawing chips with recipientEditText onSizeChanged when it has left and right padding.
* commit '57b5b6fa3d794c0ea1f517afefa871a2a32aa561':
Fix redrawing chips with recipientEditText onSizeChanged when it has left and right padding.
|
| 57b5b6fa3d794c0ea1f517afefa871a2a32aa561 |
03-Mar-2014 |
Kevin Lin <linkevin@google.com> |
am 0c58c370: Fix redrawing chips with recipientEditText onSizeChanged when it has left and right padding.
* commit '0c58c3707163765a65847d07ada963627eccb671':
Fix redrawing chips with recipientEditText onSizeChanged when it has left and right padding.
|
| 0c58c3707163765a65847d07ada963627eccb671 |
01-Mar-2014 |
Kevin Lin <linkevin@google.com> |
Fix redrawing chips with recipientEditText onSizeChanged when it has left and right padding.
Change-Id: I4021ddc0359f6e7a807ba4b10d12c80fc01c25a4
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 53e68fc85221aca7a4bd91c7cf11785297ed7e63 |
28-Feb-2014 |
Kevin Lin <linkevin@google.com> |
am 2c2b17ec: am 15fa87c9: am af559a10: am ab307ee2: am 66df41d9: Fix build with VisibleRecipientChip
* commit '2c2b17ec4bb6ebcbd2e7de6e4c63500ed8102850':
Fix build with VisibleRecipientChip
|
| 2c2b17ec4bb6ebcbd2e7de6e4c63500ed8102850 |
28-Feb-2014 |
Kevin Lin <linkevin@google.com> |
am 15fa87c9: am af559a10: am ab307ee2: am 66df41d9: Fix build with VisibleRecipientChip
* commit '15fa87c9aca950419f4601d58979cc5e3dccf061':
Fix build with VisibleRecipientChip
|
| 15fa87c9aca950419f4601d58979cc5e3dccf061 |
28-Feb-2014 |
Kevin Lin <linkevin@google.com> |
am af559a10: am ab307ee2: am 66df41d9: Fix build with VisibleRecipientChip
* commit 'af559a10efcb14f34cc83b55cc41802414ffac7f':
Fix build with VisibleRecipientChip
|
| af559a10efcb14f34cc83b55cc41802414ffac7f |
28-Feb-2014 |
Kevin Lin <linkevin@google.com> |
am ab307ee2: am 66df41d9: Fix build with VisibleRecipientChip
* commit 'ab307ee275d8a77489a687348f8b84f137515555':
Fix build with VisibleRecipientChip
|
| ab307ee275d8a77489a687348f8b84f137515555 |
28-Feb-2014 |
Kevin Lin <linkevin@google.com> |
am 66df41d9: Fix build with VisibleRecipientChip
* commit '66df41d9647f7735b6b4d0129af078a240dcca81':
Fix build with VisibleRecipientChip
|
| 66df41d9647f7735b6b4d0129af078a240dcca81 |
28-Feb-2014 |
Kevin Lin <linkevin@google.com> |
Fix build with VisibleRecipientChip
Change-Id: Iea5154938872a56cb082b2814c446a6a741006f9
hips/src/com/android/ex/chips/recipientchip/VisibleRecipientChip.java
|
| 82ef8639bf9c2d6e44fc6f903655e04da937dd52 |
28-Feb-2014 |
Kevin Lin <linkevin@google.com> |
am 07c0fcd1: am 93e48b10: am 0764e983: am 4a0aacfe: am d4ae44ec: Added support to choose vertical alignment for image spans.
* commit '07c0fcd10aeb14c6ae9b7edf13176ad35abbb884':
Added support to choose vertical alignment for image spans.
|
| 07c0fcd10aeb14c6ae9b7edf13176ad35abbb884 |
28-Feb-2014 |
Kevin Lin <linkevin@google.com> |
am 93e48b10: am 0764e983: am 4a0aacfe: am d4ae44ec: Added support to choose vertical alignment for image spans.
* commit '93e48b10fbc25fc4cb37ff1238eb960b15700555':
Added support to choose vertical alignment for image spans.
|
| 93e48b10fbc25fc4cb37ff1238eb960b15700555 |
28-Feb-2014 |
Kevin Lin <linkevin@google.com> |
am 0764e983: am 4a0aacfe: am d4ae44ec: Added support to choose vertical alignment for image spans.
* commit '0764e983c588d90e6b5f88ee1e95be75d7f69460':
Added support to choose vertical alignment for image spans.
|
| 0764e983c588d90e6b5f88ee1e95be75d7f69460 |
28-Feb-2014 |
Kevin Lin <linkevin@google.com> |
am 4a0aacfe: am d4ae44ec: Added support to choose vertical alignment for image spans.
* commit '4a0aacfe08caceb89c0124f8e234a26a457c95f4':
Added support to choose vertical alignment for image spans.
|
| 4a0aacfe08caceb89c0124f8e234a26a457c95f4 |
28-Feb-2014 |
Kevin Lin <linkevin@google.com> |
am d4ae44ec: Added support to choose vertical alignment for image spans.
* commit 'd4ae44ec6721e7819b246f70e23eb393cb8fb529':
Added support to choose vertical alignment for image spans.
|
| d4ae44ec6721e7819b246f70e23eb393cb8fb529 |
26-Feb-2014 |
Kevin Lin <linkevin@google.com> |
Added support to choose vertical alignment for image spans.
TESTED=phone
Change-Id: I582224467b4626afd1414889166f4fbbc773897f
hips/res/values/attrs.xml
hips/src/com/android/ex/chips/RecipientEditTextView.java
hips/src/com/android/ex/chips/recipientchip/VisibleRecipientChip.java
|
| a26b26178f71fab3a6115b8cb094245f67ee003f |
12-Feb-2014 |
Xavier Ducrohet <xav@google.com> |
Fix buildDir issue.
Change-Id: I2d441100f9ab85bd6631c60621438363b67ca6bd
ommon/build.gradle
|
| ef66d5292a0fa0a1ad1e0f8ac53f1457f51e132a |
21-Feb-2014 |
Baligh Uddin <baligh@google.com> |
am 90b1744d: (-s ours) am 9a823b56: (-s ours) am 255166c7: (-s ours) am 30febb9a: (-s ours) am 64becd80: (-s ours) am e49544de: (-s ours) Import translations. DO NOT MERGE
* commit '90b1744dd92383f2a7066f28f672a01f4c281074':
Import translations. DO NOT MERGE
|
| 90b1744dd92383f2a7066f28f672a01f4c281074 |
20-Feb-2014 |
Baligh Uddin <baligh@google.com> |
am 9a823b56: (-s ours) am 255166c7: (-s ours) am 30febb9a: (-s ours) am 64becd80: (-s ours) am e49544de: (-s ours) Import translations. DO NOT MERGE
* commit '9a823b56af2908f7359e2bd9ea6f553bf7cde3db':
Import translations. DO NOT MERGE
|
| 9a823b56af2908f7359e2bd9ea6f553bf7cde3db |
20-Feb-2014 |
Baligh Uddin <baligh@google.com> |
am 255166c7: (-s ours) am 30febb9a: (-s ours) am 64becd80: (-s ours) am e49544de: (-s ours) Import translations. DO NOT MERGE
* commit '255166c76ba4fd1f5039c652bb39f2c90e3c03c2':
Import translations. DO NOT MERGE
|
| 255166c76ba4fd1f5039c652bb39f2c90e3c03c2 |
20-Feb-2014 |
Baligh Uddin <baligh@google.com> |
am 30febb9a: (-s ours) am 64becd80: (-s ours) am e49544de: (-s ours) Import translations. DO NOT MERGE
* commit '30febb9a056070f9303b78d840255284ee9e1196':
Import translations. DO NOT MERGE
|
| 30febb9a056070f9303b78d840255284ee9e1196 |
20-Feb-2014 |
Baligh Uddin <baligh@google.com> |
am 64becd80: (-s ours) am e49544de: (-s ours) Import translations. DO NOT MERGE
* commit '64becd8054a1ea648b306b0531655b435561e271':
Import translations. DO NOT MERGE
|
| 64becd8054a1ea648b306b0531655b435561e271 |
20-Feb-2014 |
Baligh Uddin <baligh@google.com> |
am e49544de: (-s ours) Import translations. DO NOT MERGE
* commit 'e49544de8cf5224d0fd2af944b1431c92f7b83f9':
Import translations. DO NOT MERGE
|
| e49544de8cf5224d0fd2af944b1431c92f7b83f9 |
20-Feb-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: I7fe4f19559fd348ccd5a802cd93f29707ac11a65
Auto-generated-cl: translation import
arousel/test/res/values-ca/strings.xml
|
| 623648bd77253a87a55d3f143631dd785fa01e50 |
19-Feb-2014 |
Scott Kennedy <skennedy@google.com> |
am 5a32825f: am f4646b4c: am bb001e29: am 5da5d23b: BaseRecipientAdapter does not need to be abstract
* commit '5a32825f8eea4f99967d00e7282a7e4963bba379':
BaseRecipientAdapter does not need to be abstract
|
| 5a32825f8eea4f99967d00e7282a7e4963bba379 |
19-Feb-2014 |
Scott Kennedy <skennedy@google.com> |
am f4646b4c: am bb001e29: am 5da5d23b: BaseRecipientAdapter does not need to be abstract
* commit 'f4646b4c169f24dd6a44040c758037b0b450f366':
BaseRecipientAdapter does not need to be abstract
|
| f4646b4c169f24dd6a44040c758037b0b450f366 |
19-Feb-2014 |
Scott Kennedy <skennedy@google.com> |
am bb001e29: am 5da5d23b: BaseRecipientAdapter does not need to be abstract
* commit 'bb001e29594aa982e9cacf62806624326152fffa':
BaseRecipientAdapter does not need to be abstract
|
| bb001e29594aa982e9cacf62806624326152fffa |
19-Feb-2014 |
Scott Kennedy <skennedy@google.com> |
am 5da5d23b: BaseRecipientAdapter does not need to be abstract
* commit '5da5d23b1d8810b41db5e974e1a859937173bb8e':
BaseRecipientAdapter does not need to be abstract
|
| 5da5d23b1d8810b41db5e974e1a859937173bb8e |
19-Feb-2014 |
Scott Kennedy <skennedy@google.com> |
BaseRecipientAdapter does not need to be abstract
It works fine if you use BRA as your adapter, so there's no point
making people instantiate it as new BRA() { };
Bug: 8885347
Change-Id: Icdd8d3032a10fabd30a9a80b99204b20bdea9cd9
hips/src/com/android/ex/chips/BaseRecipientAdapter.java
|
| 9ea321d115d8a620a02eb068ed539cca05d6243c |
14-Feb-2014 |
Narayan Kamath <narayan@google.com> |
am 2a573a6a: am 56bab444: Merge "AArch64: Fix GetChannelCount() declaration."
* commit '2a573a6aa31f1408382c96815b5b51b8b1a69bf3':
AArch64: Fix GetChannelCount() declaration.
|
| 29ec2dc1290d8bfb77445fce05c43117e030abed |
14-Feb-2014 |
Narayan Kamath <narayan@google.com> |
am 7a690375: am 9ddd5eeb: Merge "AArch64: Minor JNI type changes"
* commit '7a6903758c80ec8bce17f6224215153bfc206e14':
AArch64: Minor JNI type changes
|
| 2a573a6aa31f1408382c96815b5b51b8b1a69bf3 |
14-Feb-2014 |
Narayan Kamath <narayan@google.com> |
am 56bab444: Merge "AArch64: Fix GetChannelCount() declaration."
* commit '56bab444c3bc89bb63aac728f549bd3261d01f6f':
AArch64: Fix GetChannelCount() declaration.
|
| 7a6903758c80ec8bce17f6224215153bfc206e14 |
14-Feb-2014 |
Narayan Kamath <narayan@google.com> |
am 9ddd5eeb: Merge "AArch64: Minor JNI type changes"
* commit '9ddd5eebd43aeaeb2e5b366b497e7576ca5c3ef9':
AArch64: Minor JNI type changes
|
| 56bab444c3bc89bb63aac728f549bd3261d01f6f |
14-Feb-2014 |
Narayan Kamath <narayan@google.com> |
Merge "AArch64: Fix GetChannelCount() declaration."
|
| 9ddd5eebd43aeaeb2e5b366b497e7576ca5c3ef9 |
14-Feb-2014 |
Narayan Kamath <narayan@google.com> |
Merge "AArch64: Minor JNI type changes"
|
| 787277ee4eb958320a9fd59c3381971b2636ab6d |
12-Feb-2014 |
Ashok Bhat <ashok.bhat@arm.com> |
AArch64: Minor JNI type changes
Change-Id: I7c95da3b242c8276ae32ca152fdf7c4532cc42aa
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
ariablespeed/jni/jni_entry.cc
|
| f12ca3072b5cbe4b43aa6dce1ab27a1c33e3a99f |
12-Feb-2014 |
Ashok Bhat <ashok.bhat@arm.com> |
AArch64: Fix GetChannelCount() declaration.
Two fixes
[x] GetChannelCount() return type is size_t in the declaration and
SLuint32 in the definition. It should be SLuint32 in both places.
[x] CreateAndRealizeAudioPlayer has a size_t parameter channelCount.
This should should be SLuint32 as the actual parameter is SLuint32.
Change-Id: I64666e1cc6930bf0ea500974609305d6afb476bc
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
ariablespeed/jni/variablespeed.cc
ariablespeed/jni/variablespeed.h
|
| 9f78e2bdf2c19cb6321a5a3d21a7d4a7bb7f2aa9 |
06-Feb-2014 |
Scott Kennedy <skennedy@google.com> |
am 1ceba204: am 868fffca: am ae07c2be: Fix directory lookups
* commit '1ceba20491c7ac6330fbb2006b409dbb02ec34c4':
Fix directory lookups
|
| 1ceba20491c7ac6330fbb2006b409dbb02ec34c4 |
06-Feb-2014 |
Scott Kennedy <skennedy@google.com> |
am 868fffca: am ae07c2be: Fix directory lookups
* commit '868fffca2be3233a76b7d135428860f308688c2e':
Fix directory lookups
|
| 868fffca2be3233a76b7d135428860f308688c2e |
06-Feb-2014 |
Scott Kennedy <skennedy@google.com> |
am ae07c2be: Fix directory lookups
* commit 'ae07c2be104a1f95426b697f3074bea72bc140e1':
Fix directory lookups
|
| ae07c2be104a1f95426b697f3074bea72bc140e1 |
21-Nov-2013 |
Scott Kennedy <skennedy@google.com> |
Fix directory lookups
The previous "fix" disabled the lookups.
Now we will do the lookups, with the proper lookup key and
directory id. We also do a much better job of showing directory
images.
Bug: 11693322
Bug: 12793279
Change-Id: I372711fd7b485f3183516fce2b11f9eff46a9b23
hips/src/com/android/ex/chips/BaseRecipientAdapter.java
hips/src/com/android/ex/chips/DropdownChipLayouter.java
hips/src/com/android/ex/chips/Queries.java
hips/src/com/android/ex/chips/RecipientAlternatesAdapter.java
hips/src/com/android/ex/chips/RecipientEditTextView.java
hips/src/com/android/ex/chips/RecipientEntry.java
hips/src/com/android/ex/chips/recipientchip/BaseRecipientChip.java
hips/src/com/android/ex/chips/recipientchip/InvisibleRecipientChip.java
hips/src/com/android/ex/chips/recipientchip/SimpleRecipientChip.java
hips/src/com/android/ex/chips/recipientchip/VisibleRecipientChip.java
hips/tests/src/com/android/ex/chips/RecipientAlternatesAdapterTest.java
|
| 9f85468d65ef34a9aa1841e503ca1c6eab3c7e40 |
05-Feb-2014 |
Kevin Lin <linkevin@google.com> |
am 2b2a375a: am 8f046ac9: am 95fedd51: Change to scrollToBottomView to be protected instead of private.
* commit '2b2a375a65c2a09158c235cad5069304ecd1fead':
Change to scrollToBottomView to be protected instead of private.
|
| 2b2a375a65c2a09158c235cad5069304ecd1fead |
05-Feb-2014 |
Kevin Lin <linkevin@google.com> |
am 8f046ac9: am 95fedd51: Change to scrollToBottomView to be protected instead of private.
* commit '8f046ac9da797469b0614c399c6580cb92e71976':
Change to scrollToBottomView to be protected instead of private.
|
| 8f046ac9da797469b0614c399c6580cb92e71976 |
05-Feb-2014 |
Kevin Lin <linkevin@google.com> |
am 95fedd51: Change to scrollToBottomView to be protected instead of private.
* commit '95fedd51882128dea2152c3d1c7ff194f8e557bf':
Change to scrollToBottomView to be protected instead of private.
|
| 95fedd51882128dea2152c3d1c7ff194f8e557bf |
05-Feb-2014 |
Kevin Lin <linkevin@google.com> |
Change to scrollToBottomView to be protected instead of private.
Change-Id: Ibad81543afc87f20cf8d479fd28ac1efde6195f4
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 6f33043ab5d3edcd855eef7793f7adcbdccae5bd |
04-Feb-2014 |
Kevin Lin <linkevin@google.com> |
am 6396ce03: am 58228018: am a75fa12d: Fix chips library bugs related to setting the threshold to 1. - Dropdown not being dismissed after having at least one chip and typing a character and deleting it. - Selecting a chip, deleting it by pressing backspace, and enteri
* commit '6396ce038057cb526e92003d96665ebae0ed7143':
Fix chips library bugs related to setting the threshold to 1. - Dropdown not being dismissed after having at least one chip and typing a character and deleting it. - Selecting a chip, deleting it by pressing backspace, and entering another character brings the deleted chip back.
|
| 6396ce038057cb526e92003d96665ebae0ed7143 |
04-Feb-2014 |
Kevin Lin <linkevin@google.com> |
am 58228018: am a75fa12d: Fix chips library bugs related to setting the threshold to 1. - Dropdown not being dismissed after having at least one chip and typing a character and deleting it. - Selecting a chip, deleting it by pressing backspace, and entering another ch
* commit '58228018f7274a9490dad77dbdd06b2c5846eb6f':
Fix chips library bugs related to setting the threshold to 1. - Dropdown not being dismissed after having at least one chip and typing a character and deleting it. - Selecting a chip, deleting it by pressing backspace, and entering another character brings the deleted chip back.
|
| 58228018f7274a9490dad77dbdd06b2c5846eb6f |
04-Feb-2014 |
Kevin Lin <linkevin@google.com> |
am a75fa12d: Fix chips library bugs related to setting the threshold to 1. - Dropdown not being dismissed after having at least one chip and typing a character and deleting it. - Selecting a chip, deleting it by pressing backspace, and entering another character bring
* commit 'a75fa12d54e386392adc0d4b54284a89ec191347':
Fix chips library bugs related to setting the threshold to 1. - Dropdown not being dismissed after having at least one chip and typing a character and deleting it. - Selecting a chip, deleting it by pressing backspace, and entering another character brings the deleted chip back.
|
| a75fa12d54e386392adc0d4b54284a89ec191347 |
04-Feb-2014 |
Kevin Lin <linkevin@google.com> |
Fix chips library bugs related to setting the threshold to 1.
- Dropdown not being dismissed after having at least one chip and typing a character and deleting it.
- Selecting a chip, deleting it by pressing backspace, and entering another character brings the deleted chip back.
TESTED=chips on bigtop app
Change-Id: I09233ffa7dfe1f64ae9efe4a392fa84b64b8b10a
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| b65711a4213ccb8deac1c462e6aa1fc700a235e5 |
03-Feb-2014 |
Chris Craik <ccraik@google.com> |
am 37ac47d3: am 01801599: am a3daacb2: Handle malformed gif streams more gracefully
* commit '37ac47d3a1a9ed79222f1ff938980ae08cc9bdc3':
Handle malformed gif streams more gracefully
|
| 37ac47d3a1a9ed79222f1ff938980ae08cc9bdc3 |
03-Feb-2014 |
Chris Craik <ccraik@google.com> |
am 01801599: am a3daacb2: Handle malformed gif streams more gracefully
* commit '018015991c3559e3861c3ef054aadd355821b4ef':
Handle malformed gif streams more gracefully
|
| 018015991c3559e3861c3ef054aadd355821b4ef |
03-Feb-2014 |
Chris Craik <ccraik@google.com> |
am a3daacb2: Handle malformed gif streams more gracefully
* commit 'a3daacb24a430bc3fad7251ef962d7c7b6c47e55':
Handle malformed gif streams more gracefully
|
| a3daacb24a430bc3fad7251ef962d7c7b6c47e55 |
03-Feb-2014 |
Chris Craik <ccraik@google.com> |
Handle malformed gif streams more gracefully
Change-Id: I2ea934b90d73e1431fb3df9ff793aa8ff2033099
ramesequence/jni/FrameSequence.cpp
|
| 11e4f6f1d60924036491f33c6d5b31e31f8455bc |
31-Jan-2014 |
William Luh <williamluh@google.com> |
Resolve tag conflict between exp_det_snet and gmail_perf_end.
Change-Id: I4fd904113cd09ea84c3e80bb25b4e433f35638be
ommon/java/com/android/common/GoogleLogTags.logtags
|
| 70235389c1735428b1ee8b2e145e867f11ea6992 |
31-Jan-2014 |
William Luh <williamluh@google.com> |
Rename exp_det_snet tag to snet.
Bug:12824174
Change-Id: Ia81c998aa3ec7309c68f98ee04a5364be37b52b5
ommon/java/com/android/common/GoogleLogTags.logtags
|
| c845eeac1e4c00ac2f398e6d8737c09d528d3eb6 |
30-Jan-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
| 0b05bf5927c021f997091b072a354bc5a609989b |
30-Jan-2014 |
Xavier Ducrohet <xav@google.com> |
Fix gradle's buildDir
Change-Id: Ida0f465ae6705db041469c5a5fe461a8affedf74
ommon/build.gradle
|
| 63d66d166e4daa184e1d6de951f0906f7b803f25 |
30-Jan-2014 |
Xavier Ducrohet <xav@google.com> |
Disable break on lint error.
Change-Id: I95b6301074f9a2d72ad26b9ada49d3b3b1020c01
ommon/build.gradle
|
| e96b5cee7f82df9954b5963a00fcdbf192d40397 |
29-Jan-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: I503597eb90961f762c3f699015a0e42a0222d6fa
Auto-generated-cl: translation import
arousel/test/res/values-ca/strings.xml
|
| b0550328509bf2b7e28d88ad2a2255865c439bc7 |
29-Jan-2014 |
Scott Kennedy <skennedy@google.com> |
am 6e247616: am a799ac06: am 26b19245: am 7b83246c: Build against api 19
* commit '6e2476167e6f20028def6c0be3eb0ac438dcbc01':
Build against api 19
|
| 2aa11acb0d32e7d85a8f3ec1fd32e62fdfd8d66e |
29-Jan-2014 |
Scott Kennedy <skennedy@google.com> |
am fab89bc1: am 41ec1e20: am 80478fa4: am e9b57c9e: Fix a small bug
* commit 'fab89bc1c872b5472f79c98323fd1d97c20abf28':
Fix a small bug
|
| 6e2476167e6f20028def6c0be3eb0ac438dcbc01 |
29-Jan-2014 |
Scott Kennedy <skennedy@google.com> |
am a799ac06: am 26b19245: am 7b83246c: Build against api 19
* commit 'a799ac06197f2ef732757a987cbc3eb32547ab4d':
Build against api 19
|
| fab89bc1c872b5472f79c98323fd1d97c20abf28 |
29-Jan-2014 |
Scott Kennedy <skennedy@google.com> |
am 41ec1e20: am 80478fa4: am e9b57c9e: Fix a small bug
* commit '41ec1e203117c21672da2829db6f79bde4c15739':
Fix a small bug
|
| a799ac06197f2ef732757a987cbc3eb32547ab4d |
29-Jan-2014 |
Scott Kennedy <skennedy@google.com> |
am 26b19245: am 7b83246c: Build against api 19
* commit '26b192456eca11b5f44c819582df6643450b7fe7':
Build against api 19
|
| 41ec1e203117c21672da2829db6f79bde4c15739 |
29-Jan-2014 |
Scott Kennedy <skennedy@google.com> |
am 80478fa4: am e9b57c9e: Fix a small bug
* commit '80478fa43210f5a0acae123d2a43a067574f4e40':
Fix a small bug
|
| 26b192456eca11b5f44c819582df6643450b7fe7 |
29-Jan-2014 |
Scott Kennedy <skennedy@google.com> |
am 7b83246c: Build against api 19
* commit '7b83246c90d63100bd99edac1b2c31855505c081':
Build against api 19
|
| 80478fa43210f5a0acae123d2a43a067574f4e40 |
29-Jan-2014 |
Scott Kennedy <skennedy@google.com> |
am e9b57c9e: Fix a small bug
* commit 'e9b57c9e260f245b4527116143206e2d62f24edd':
Fix a small bug
|
| 7b83246c90d63100bd99edac1b2c31855505c081 |
29-Jan-2014 |
Scott Kennedy <skennedy@google.com> |
Build against api 19
Change-Id: Ie7f19f6cd219a2327e3fcf21a8ce82a8416cfbf5
hips/project.properties
|
| e9b57c9e260f245b4527116143206e2d62f24edd |
29-Jan-2014 |
Scott Kennedy <skennedy@google.com> |
Fix a small bug
Change-Id: I92babdcb1488195a073d2393b03083c8c74f740f
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 669adddca65b7c41047feffd7bb646ca0f1b33f4 |
28-Jan-2014 |
Kevin Lin <linkevin@google.com> |
am 1376b739: am 9bfa2a6b: am be8700bb: am 2e7571b5: Fixed NPE in BaseRecipientAdapter when constraint is null.
* commit '1376b739954cc61afc55770415745ccad97f51d6':
Fixed NPE in BaseRecipientAdapter when constraint is null.
|
| 1376b739954cc61afc55770415745ccad97f51d6 |
28-Jan-2014 |
Kevin Lin <linkevin@google.com> |
am 9bfa2a6b: am be8700bb: am 2e7571b5: Fixed NPE in BaseRecipientAdapter when constraint is null.
* commit '9bfa2a6bc36323788de552ffc0c1960e51dcb4e9':
Fixed NPE in BaseRecipientAdapter when constraint is null.
|
| 9bfa2a6bc36323788de552ffc0c1960e51dcb4e9 |
28-Jan-2014 |
Kevin Lin <linkevin@google.com> |
am be8700bb: am 2e7571b5: Fixed NPE in BaseRecipientAdapter when constraint is null.
* commit 'be8700bbd9bc15b0e6798149e9a68059da5b27a9':
Fixed NPE in BaseRecipientAdapter when constraint is null.
|
| be8700bbd9bc15b0e6798149e9a68059da5b27a9 |
28-Jan-2014 |
Kevin Lin <linkevin@google.com> |
am 2e7571b5: Fixed NPE in BaseRecipientAdapter when constraint is null.
* commit '2e7571b5f06725a3a54a73bcc2c83a8b39c9da22':
Fixed NPE in BaseRecipientAdapter when constraint is null.
|
| 2e7571b5f06725a3a54a73bcc2c83a8b39c9da22 |
28-Jan-2014 |
Kevin Lin <linkevin@google.com> |
Fixed NPE in BaseRecipientAdapter when constraint is null.
BUG=12766155
Change-Id: I99cf03e33738ad804e35e7134c9d9a97c84be183
hips/src/com/android/ex/chips/BaseRecipientAdapter.java
|
| 6e3f5a05061ffa3cc4a0cf374fb0fe28e46f2e56 |
27-Jan-2014 |
Andrew Sapperstein <asapperstein@google.com> |
am 51401366: am b74a98d1: am 263ca4e5: am 2b8b9029: Support RTL in chips library.
* commit '51401366c84d0285d69b7a967d14465a4702671d':
Support RTL in chips library.
|
| 51401366c84d0285d69b7a967d14465a4702671d |
27-Jan-2014 |
Andrew Sapperstein <asapperstein@google.com> |
am b74a98d1: am 263ca4e5: am 2b8b9029: Support RTL in chips library.
* commit 'b74a98d177f2b194612910c20111156d0d29fcad':
Support RTL in chips library.
|
| b74a98d177f2b194612910c20111156d0d29fcad |
27-Jan-2014 |
Andrew Sapperstein <asapperstein@google.com> |
am 263ca4e5: am 2b8b9029: Support RTL in chips library.
* commit '263ca4e5a6babb5a71b768d7a55a099ae824bd4c':
Support RTL in chips library.
|
| 263ca4e5a6babb5a71b768d7a55a099ae824bd4c |
27-Jan-2014 |
Andrew Sapperstein <asapperstein@google.com> |
am 2b8b9029: Support RTL in chips library.
* commit '2b8b9029fd4e44447e59d7349c656cc32b2de9c7':
Support RTL in chips library.
|
| 2b8b9029fd4e44447e59d7349c656cc32b2de9c7 |
25-Jan-2014 |
Andrew Sapperstein <asapperstein@google.com> |
Support RTL in chips library.
Fixes b/12569794.
Change-Id: I927a5d3e0d4af42a3ca3fbbb87ba201fe7bb830e
hips/Android.mk
hips/AndroidManifest.xml
hips/res/layout/chips_recipient_dropdown_item.xml
hips/res/values-v17/styles-v17.xml
hips/res/values/attrs.xml
hips/res/values/dimen.xml
hips/res/values/styles.xml
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 51fc7ff960b57f6bc3ae393d9ae7ecc27031eae0 |
25-Jan-2014 |
Kevin Lin <linkevin@google.com> |
am 693a1515: am 60e3986c: am 09e73cb2: am 2b080e1e: Main changes to the chips library: Changed attribute styles - Added an avatar position (left, right) inside the chip - Added a disableDelete boolean - Removed chipsAlternateLayout
* commit '693a15154c497b2bf454774b87be0a698cafe15b':
Main changes to the chips library: Changed attribute styles - Added an avatar position (left, right) inside the chip - Added a disableDelete boolean - Removed chipsAlternateLayout
|
| 693a15154c497b2bf454774b87be0a698cafe15b |
25-Jan-2014 |
Kevin Lin <linkevin@google.com> |
am 60e3986c: am 09e73cb2: am 2b080e1e: Main changes to the chips library: Changed attribute styles - Added an avatar position (left, right) inside the chip - Added a disableDelete boolean - Removed chipsAlternateLayout
* commit '60e3986c348702df31b721e9e6b1aa072594dc22':
Main changes to the chips library: Changed attribute styles - Added an avatar position (left, right) inside the chip - Added a disableDelete boolean - Removed chipsAlternateLayout
|
| 60e3986c348702df31b721e9e6b1aa072594dc22 |
25-Jan-2014 |
Kevin Lin <linkevin@google.com> |
am 09e73cb2: am 2b080e1e: Main changes to the chips library: Changed attribute styles - Added an avatar position (left, right) inside the chip - Added a disableDelete boolean - Removed chipsAlternateLayout
* commit '09e73cb2e3a40482d67d7e4448b8354d115dff01':
Main changes to the chips library: Changed attribute styles - Added an avatar position (left, right) inside the chip - Added a disableDelete boolean - Removed chipsAlternateLayout
|
| 09e73cb2e3a40482d67d7e4448b8354d115dff01 |
24-Jan-2014 |
Kevin Lin <linkevin@google.com> |
am 2b080e1e: Main changes to the chips library: Changed attribute styles - Added an avatar position (left, right) inside the chip - Added a disableDelete boolean - Removed chipsAlternateLayout
* commit '2b080e1e1e24a2096fea375d825aa19089fa3e32':
Main changes to the chips library: Changed attribute styles - Added an avatar position (left, right) inside the chip - Added a disableDelete boolean - Removed chipsAlternateLayout
|
| 2b080e1e1e24a2096fea375d825aa19089fa3e32 |
24-Jan-2014 |
Kevin Lin <linkevin@google.com> |
Main changes to the chips library:
Changed attribute styles
- Added an avatar position (left, right) inside the chip
- Added a disableDelete boolean
- Removed chipsAlternateLayout
Changed how to layout contacts in autocomplete list.
Added a separate class to handle layout and binding information. (This way clients can extend this class and have a customizable layout)
This new class lives inside RecipientEditTextView and is passed onto each adapter.
Merged code paths for createSelectedChip and createUnselectedChip.
Merged code paths for getView() in each of the 3 adapters by using DropdownChipLayouter.
All tests still pass since this CL is mostly infrastructure layout changes.
There are some non-backwards compatible changes with this if other clients are using this library.
BaseRecipientAdapter no longer has protected methods to override the layout and id's.
The attribute file no longer has chipsAlternateLaytout.
Both these features can still be used through the new DropdownChipLayouter class.
Change-Id: I4496232eddd194be2df6a047f75637114f2eaa52
hips/res/values/attrs.xml
hips/src/com/android/ex/chips/BaseRecipientAdapter.java
hips/src/com/android/ex/chips/DropdownChipLayouter.java
hips/src/com/android/ex/chips/RecipientAlternatesAdapter.java
hips/src/com/android/ex/chips/RecipientEditTextView.java
hips/src/com/android/ex/chips/SingleRecipientArrayAdapter.java
|
| 98c691d7177f782bec3b2f8231f174c612b85d06 |
23-Jan-2014 |
Xavier Ducrohet <xav@google.com> |
Update build-tools version for gradle.
Change-Id: Idab026ff51832d799775e32c9955b238e1240e43
ommon/build.gradle
|
| dd181e04691d58e3b16b14025a8ca5a2fe00c35e |
15-Jan-2014 |
Chris Craik <ccraik@google.com> |
am df4ec5fe: am 52e97f30: am 8b501c37: am 2e201491: Fix jni method label
* commit 'df4ec5fe049cf5857d3a90a30a31e448697e860e':
Fix jni method label
|
| df4ec5fe049cf5857d3a90a30a31e448697e860e |
15-Jan-2014 |
Chris Craik <ccraik@google.com> |
am 52e97f30: am 8b501c37: am 2e201491: Fix jni method label
* commit '52e97f3001da2e56b6a3f34e5ee034a18a22972c':
Fix jni method label
|
| 52e97f3001da2e56b6a3f34e5ee034a18a22972c |
15-Jan-2014 |
Chris Craik <ccraik@google.com> |
am 8b501c37: am 2e201491: Fix jni method label
* commit '8b501c3784389b2ab9248e91e7608e4f085f63a5':
Fix jni method label
|
| 8b501c3784389b2ab9248e91e7608e4f085f63a5 |
15-Jan-2014 |
Chris Craik <ccraik@google.com> |
am 2e201491: Fix jni method label
* commit '2e20149189469ac45426c3f1f7df067995a5e811':
Fix jni method label
|
| 2e20149189469ac45426c3f1f7df067995a5e811 |
15-Jan-2014 |
Chris Craik <ccraik@google.com> |
Fix jni method label
Change-Id: I7d9c3671c0e22970d77098509d6458fafb659709
ramesequence/jni/FrameSequenceJNI.cpp
|
| e369a279acf2d3bb9e51c474df92ffe34d56dd5a |
15-Jan-2014 |
Chris Craik <ccraik@google.com> |
am c3279de0: am 017e96de: am a49a74cb: am e36c5d67: Add loop count control
* commit 'c3279de077e1bea6868bee4c0146bb27b9782ab6':
Add loop count control
|
| c3279de077e1bea6868bee4c0146bb27b9782ab6 |
15-Jan-2014 |
Chris Craik <ccraik@google.com> |
am 017e96de: am a49a74cb: am e36c5d67: Add loop count control
* commit '017e96dee73b09c0b9eab0673fcc7a187e28ec9d':
Add loop count control
|
| 017e96dee73b09c0b9eab0673fcc7a187e28ec9d |
15-Jan-2014 |
Chris Craik <ccraik@google.com> |
am a49a74cb: am e36c5d67: Add loop count control
* commit 'a49a74cb90368a3bb428600563439adc744a9e01':
Add loop count control
|
| a49a74cb90368a3bb428600563439adc744a9e01 |
15-Jan-2014 |
Chris Craik <ccraik@google.com> |
am e36c5d67: Add loop count control
* commit 'e36c5d675c8c2f900ef186a55edf71ce36ca9fa0':
Add loop count control
|
| e36c5d675c8c2f900ef186a55edf71ce36ca9fa0 |
14-Jan-2014 |
Chris Craik <ccraik@google.com> |
Add loop count control
-Adds callback into app for drawable that finishes animating
-Fixes timestamp delay mapping (was previously off by one)
-64 bit pointer storage
Change-Id: I21cf7eb325fd58fb0aeda58f864d35fe483a89a7
ramesequence/jni/FrameSequence.h
ramesequence/jni/FrameSequenceJNI.cpp
ramesequence/jni/FrameSequence_gif.cpp
ramesequence/jni/FrameSequence_gif.h
ramesequence/samples/RastermillSamples/src/com/android/rastermill/samples/AnimatedGifTest.java
ramesequence/src/android/support/rastermill/FrameSequence.java
ramesequence/src/android/support/rastermill/FrameSequenceDrawable.java
|
| 98bbbe7fdaec2cea1d8188c7d3203d0d984ea6d5 |
14-Jan-2014 |
John Reck <jreck@google.com> |
am e96d44a0: am 83e63821: am bc8c31e4: am 335482c4: Fix make files for unbundled tree builds
* commit 'e96d44a081d0394a45a4f7a9b1d2e56934df795b':
Fix make files for unbundled tree builds
|
| 867094365c0eef6102c07173f9903e7b8016a990 |
14-Jan-2014 |
Chris Craik <ccraik@google.com> |
am 0b2aa72b: am 653b6da7: am 4947daa1: am 259f6b74: Mark framesequence test app strings as untranslatable
* commit '0b2aa72bb550f09dc7fbe5da25251796b5a7c87a':
Mark framesequence test app strings as untranslatable
|
| 30fd7d2d82a13dba3580dd848084cba73cdd3eb9 |
14-Jan-2014 |
Chris Craik <ccraik@google.com> |
resolved conflicts for merge of c78082b6 to master
|
| e96d44a081d0394a45a4f7a9b1d2e56934df795b |
14-Jan-2014 |
John Reck <jreck@google.com> |
am 83e63821: am bc8c31e4: am 335482c4: Fix make files for unbundled tree builds
* commit '83e63821d4bc0ad10ceec8d9bfa269bd749819d6':
Fix make files for unbundled tree builds
|
| 0b2aa72bb550f09dc7fbe5da25251796b5a7c87a |
14-Jan-2014 |
Chris Craik <ccraik@google.com> |
am 653b6da7: am 4947daa1: am 259f6b74: Mark framesequence test app strings as untranslatable
* commit '653b6da7fdef04161a95471aca08fe61ea29fb86':
Mark framesequence test app strings as untranslatable
|
| c78082b6049aaa7c5f0c171f56131d4f5e67142e |
14-Jan-2014 |
Chris Craik <ccraik@google.com> |
am b2a3c610: am c38412fd: am a3ac0a2d: Import FrameSequence
* commit 'b2a3c610684f81dd14ced1b1053a379a49d570d3':
Import FrameSequence
|
| 83e63821d4bc0ad10ceec8d9bfa269bd749819d6 |
14-Jan-2014 |
John Reck <jreck@google.com> |
am bc8c31e4: am 335482c4: Fix make files for unbundled tree builds
* commit 'bc8c31e47661249db1724b01242e07bacfb6a2fd':
Fix make files for unbundled tree builds
|
| 653b6da7fdef04161a95471aca08fe61ea29fb86 |
14-Jan-2014 |
Chris Craik <ccraik@google.com> |
am 4947daa1: am 259f6b74: Mark framesequence test app strings as untranslatable
* commit '4947daa1e7d2bab55e59529457cc188766005a61':
Mark framesequence test app strings as untranslatable
|
| b2a3c610684f81dd14ced1b1053a379a49d570d3 |
14-Jan-2014 |
Chris Craik <ccraik@google.com> |
am c38412fd: am a3ac0a2d: Import FrameSequence
* commit 'c38412fd28996379958f6f24def3f6e4ce8fecbe':
Import FrameSequence
|
| bc8c31e47661249db1724b01242e07bacfb6a2fd |
14-Jan-2014 |
John Reck <jreck@google.com> |
am 335482c4: Fix make files for unbundled tree builds
* commit '335482c41b2ac3b66da2e207b47306fb53f4b174':
Fix make files for unbundled tree builds
|
| 4947daa1e7d2bab55e59529457cc188766005a61 |
14-Jan-2014 |
Chris Craik <ccraik@google.com> |
am 259f6b74: Mark framesequence test app strings as untranslatable
* commit '259f6b7455a9dee4d4dcf1444b0b760307f04247':
Mark framesequence test app strings as untranslatable
|
| c38412fd28996379958f6f24def3f6e4ce8fecbe |
14-Jan-2014 |
Chris Craik <ccraik@google.com> |
am a3ac0a2d: Import FrameSequence
* commit 'a3ac0a2df64dcfb8b0b01f1cf05e9afd1439e1f4':
Import FrameSequence
|
| 335482c41b2ac3b66da2e207b47306fb53f4b174 |
09-Jan-2014 |
John Reck <jreck@google.com> |
Fix make files for unbundled tree builds
Change-Id: I6522ad5422c69852d540119b9cbda281d87fde55
(cherry picked from commit 0014f661f355008b0ada8ff9562673b69014d3f6)
ramesequence/Android.mk
ramesequence/jni/Android.mk
|
| 259f6b7455a9dee4d4dcf1444b0b760307f04247 |
08-Jan-2014 |
Chris Craik <ccraik@google.com> |
Mark framesequence test app strings as untranslatable
bug:12445874
Change-Id: Icf8356cc643698fea2eee686edaf772d74680e91
(cherry picked from commit 052fc0abbfc7f339b2283ae6497febd6e03f0340)
ramesequence/samples/RastermillSamples/res/values/strings.xml
|
| 6ad0404d0661a0f5b9b0e385b8cb3aa281fa041a |
13-Jan-2014 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE
Change-Id: I236c93ae556816a04442e701cf90e60c9c1503be
Auto-generated-cl: translation import
ramesequence/samples/RastermillSamples/res/values-af/strings.xml
ramesequence/samples/RastermillSamples/res/values-ar/strings.xml
ramesequence/samples/RastermillSamples/res/values-ca/strings.xml
ramesequence/samples/RastermillSamples/res/values-cs/strings.xml
ramesequence/samples/RastermillSamples/res/values-da/strings.xml
ramesequence/samples/RastermillSamples/res/values-de/strings.xml
ramesequence/samples/RastermillSamples/res/values-el/strings.xml
ramesequence/samples/RastermillSamples/res/values-en-rGB/strings.xml
ramesequence/samples/RastermillSamples/res/values-en-rIN/strings.xml
ramesequence/samples/RastermillSamples/res/values-es/strings.xml
ramesequence/samples/RastermillSamples/res/values-et-rEE/strings.xml
ramesequence/samples/RastermillSamples/res/values-fi/strings.xml
ramesequence/samples/RastermillSamples/res/values-fr-rCA/strings.xml
ramesequence/samples/RastermillSamples/res/values-hi/strings.xml
ramesequence/samples/RastermillSamples/res/values-hr/strings.xml
ramesequence/samples/RastermillSamples/res/values-hu/strings.xml
ramesequence/samples/RastermillSamples/res/values-in/strings.xml
ramesequence/samples/RastermillSamples/res/values-it/strings.xml
ramesequence/samples/RastermillSamples/res/values-iw/strings.xml
ramesequence/samples/RastermillSamples/res/values-km-rKH/strings.xml
ramesequence/samples/RastermillSamples/res/values-lt/strings.xml
ramesequence/samples/RastermillSamples/res/values-mn-rMN/strings.xml
ramesequence/samples/RastermillSamples/res/values-nb/strings.xml
ramesequence/samples/RastermillSamples/res/values-nl/strings.xml
ramesequence/samples/RastermillSamples/res/values-pl/strings.xml
ramesequence/samples/RastermillSamples/res/values-pt-rPT/strings.xml
ramesequence/samples/RastermillSamples/res/values-sl/strings.xml
ramesequence/samples/RastermillSamples/res/values-sr/strings.xml
ramesequence/samples/RastermillSamples/res/values-sv/strings.xml
ramesequence/samples/RastermillSamples/res/values-uk/strings.xml
ramesequence/samples/RastermillSamples/res/values-zu/strings.xml
|
| a3ac0a2df64dcfb8b0b01f1cf05e9afd1439e1f4 |
06-Jan-2014 |
Chris Craik <ccraik@google.com> |
Import FrameSequence
Change-Id: I09b668925366a22e8e7e80e4abeae24b3a98c639
(cherry picked from commit a1265c3d8a20e805e0c45083d5c7d728d4b70009)
ramesequence/Android.mk
ramesequence/AndroidManifest.xml
ramesequence/build.xml
ramesequence/jni/Android.mk
ramesequence/jni/Application.mk
ramesequence/jni/BitmapDecoderJNI.cpp
ramesequence/jni/Color.h
ramesequence/jni/FrameSequence.cpp
ramesequence/jni/FrameSequence.h
ramesequence/jni/FrameSequenceJNI.cpp
ramesequence/jni/FrameSequenceJNI.h
ramesequence/jni/FrameSequence_gif.cpp
ramesequence/jni/FrameSequence_gif.h
ramesequence/jni/JNIHelpers.cpp
ramesequence/jni/JNIHelpers.h
ramesequence/jni/Registry.cpp
ramesequence/jni/Registry.h
ramesequence/jni/Stream.cpp
ramesequence/jni/Stream.h
ramesequence/jni/utils/log.h
ramesequence/jni/utils/math.h
ramesequence/project.properties
ramesequence/samples/RastermillSamples/Android.mk
ramesequence/samples/RastermillSamples/AndroidManifest.xml
ramesequence/samples/RastermillSamples/build.xml
ramesequence/samples/RastermillSamples/proguard.flags
ramesequence/samples/RastermillSamples/project.properties
ramesequence/samples/RastermillSamples/res/drawable-hdpi/ic_launcher.png
ramesequence/samples/RastermillSamples/res/drawable-mdpi/ic_launcher.png
ramesequence/samples/RastermillSamples/res/drawable-xhdpi/ic_launcher.png
ramesequence/samples/RastermillSamples/res/layout/basic_test_activity.xml
ramesequence/samples/RastermillSamples/res/raw/animated.gif
ramesequence/samples/RastermillSamples/res/values/strings.xml
ramesequence/samples/RastermillSamples/res/values/styles.xml
ramesequence/samples/RastermillSamples/src/com/android/rastermill/samples/AnimatedGifTest.java
ramesequence/samples/RastermillSamples/src/com/android/rastermill/samples/SamplesList.java
ramesequence/src/android/support/rastermill/FrameSequence.java
ramesequence/src/android/support/rastermill/FrameSequenceDrawable.java
|
| 5b67708cea54455de2d06a3386d023a399d78417 |
09-Jan-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
| 0014f661f355008b0ada8ff9562673b69014d3f6 |
09-Jan-2014 |
John Reck <jreck@google.com> |
Fix make files for unbundled tree builds
Change-Id: I6522ad5422c69852d540119b9cbda281d87fde55
ramesequence/Android.mk
ramesequence/jni/Android.mk
|
| 052fc0abbfc7f339b2283ae6497febd6e03f0340 |
08-Jan-2014 |
Chris Craik <ccraik@google.com> |
Mark framesequence test app strings as untranslatable
bug:12445874
Change-Id: Icf8356cc643698fea2eee686edaf772d74680e91
ramesequence/samples/RastermillSamples/res/values/strings.xml
|
| a3a5443802738240cc92f3fafb337fd0a358bd21 |
08-Jan-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: I87fe9006f684c7f5166590be9b7723e3d5b4d228
Auto-generated-cl: translation import
ramesequence/samples/RastermillSamples/res/values-af/strings.xml
ramesequence/samples/RastermillSamples/res/values-ar/strings.xml
ramesequence/samples/RastermillSamples/res/values-ca/strings.xml
ramesequence/samples/RastermillSamples/res/values-cs/strings.xml
ramesequence/samples/RastermillSamples/res/values-da/strings.xml
ramesequence/samples/RastermillSamples/res/values-de/strings.xml
ramesequence/samples/RastermillSamples/res/values-el/strings.xml
ramesequence/samples/RastermillSamples/res/values-en-rGB/strings.xml
ramesequence/samples/RastermillSamples/res/values-en-rIN/strings.xml
ramesequence/samples/RastermillSamples/res/values-es/strings.xml
ramesequence/samples/RastermillSamples/res/values-et-rEE/strings.xml
ramesequence/samples/RastermillSamples/res/values-fi/strings.xml
ramesequence/samples/RastermillSamples/res/values-fr-rCA/strings.xml
ramesequence/samples/RastermillSamples/res/values-hi/strings.xml
ramesequence/samples/RastermillSamples/res/values-hr/strings.xml
ramesequence/samples/RastermillSamples/res/values-hu/strings.xml
ramesequence/samples/RastermillSamples/res/values-in/strings.xml
ramesequence/samples/RastermillSamples/res/values-it/strings.xml
ramesequence/samples/RastermillSamples/res/values-iw/strings.xml
ramesequence/samples/RastermillSamples/res/values-km-rKH/strings.xml
ramesequence/samples/RastermillSamples/res/values-lt/strings.xml
ramesequence/samples/RastermillSamples/res/values-mn-rMN/strings.xml
ramesequence/samples/RastermillSamples/res/values-nb/strings.xml
ramesequence/samples/RastermillSamples/res/values-nl/strings.xml
ramesequence/samples/RastermillSamples/res/values-pl/strings.xml
ramesequence/samples/RastermillSamples/res/values-pt-rPT/strings.xml
ramesequence/samples/RastermillSamples/res/values-sl/strings.xml
ramesequence/samples/RastermillSamples/res/values-sr/strings.xml
ramesequence/samples/RastermillSamples/res/values-sv/strings.xml
ramesequence/samples/RastermillSamples/res/values-uk/strings.xml
ramesequence/samples/RastermillSamples/res/values-zu/strings.xml
|
| 8f65fcebec483b30c050177b3483d3299c1793f8 |
07-Jan-2014 |
Chris Craik <ccraik@google.com> |
Merge "Import FrameSequence"
|
| a1265c3d8a20e805e0c45083d5c7d728d4b70009 |
06-Jan-2014 |
Chris Craik <ccraik@google.com> |
Import FrameSequence
Change-Id: I09b668925366a22e8e7e80e4abeae24b3a98c639
ramesequence/Android.mk
ramesequence/AndroidManifest.xml
ramesequence/build.xml
ramesequence/jni/Android.mk
ramesequence/jni/Application.mk
ramesequence/jni/BitmapDecoderJNI.cpp
ramesequence/jni/Color.h
ramesequence/jni/FrameSequence.cpp
ramesequence/jni/FrameSequence.h
ramesequence/jni/FrameSequenceJNI.cpp
ramesequence/jni/FrameSequenceJNI.h
ramesequence/jni/FrameSequence_gif.cpp
ramesequence/jni/FrameSequence_gif.h
ramesequence/jni/JNIHelpers.cpp
ramesequence/jni/JNIHelpers.h
ramesequence/jni/Registry.cpp
ramesequence/jni/Registry.h
ramesequence/jni/Stream.cpp
ramesequence/jni/Stream.h
ramesequence/jni/utils/log.h
ramesequence/jni/utils/math.h
ramesequence/project.properties
ramesequence/samples/RastermillSamples/Android.mk
ramesequence/samples/RastermillSamples/AndroidManifest.xml
ramesequence/samples/RastermillSamples/build.xml
ramesequence/samples/RastermillSamples/proguard.flags
ramesequence/samples/RastermillSamples/project.properties
ramesequence/samples/RastermillSamples/res/drawable-hdpi/ic_launcher.png
ramesequence/samples/RastermillSamples/res/drawable-mdpi/ic_launcher.png
ramesequence/samples/RastermillSamples/res/drawable-xhdpi/ic_launcher.png
ramesequence/samples/RastermillSamples/res/layout/basic_test_activity.xml
ramesequence/samples/RastermillSamples/res/raw/animated.gif
ramesequence/samples/RastermillSamples/res/values/strings.xml
ramesequence/samples/RastermillSamples/res/values/styles.xml
ramesequence/samples/RastermillSamples/src/com/android/rastermill/samples/AnimatedGifTest.java
ramesequence/samples/RastermillSamples/src/com/android/rastermill/samples/SamplesList.java
ramesequence/src/android/support/rastermill/FrameSequence.java
ramesequence/src/android/support/rastermill/FrameSequenceDrawable.java
|
| 47224cf1e37ad695ceaa0271aec9878aa13e62b7 |
03-Jan-2014 |
William Luh <williamluh@google.com> |
Add event log tag for Android SNet.
Bug: 12004174
Change-Id: I0023bbadba93354db2c0e5cc5b3b803d58d6f94a
ommon/java/com/android/common/GoogleLogTags.logtags
|
| a8ccb2d20a659f55c7e5f670fe90171fe8259d68 |
27-Dec-2013 |
Baligh Uddin <baligh@google.com> |
am e707db99: (-s ours) am 95b439e0: (-s ours) am c36fa7f8: (-s ours) am 58ce8de3: (-s ours) am 6b48b5de: (-s ours) Import translations. DO NOT MERGE
* commit 'e707db99284789c89a41d9f16511fa025acaed7a':
Import translations. DO NOT MERGE
|
| e707db99284789c89a41d9f16511fa025acaed7a |
27-Dec-2013 |
Baligh Uddin <baligh@google.com> |
am 95b439e0: (-s ours) am c36fa7f8: (-s ours) am 58ce8de3: (-s ours) am 6b48b5de: (-s ours) Import translations. DO NOT MERGE
* commit '95b439e0cba3ce1d597cf53b480065b51ca6f8fc':
Import translations. DO NOT MERGE
|
| 95b439e0cba3ce1d597cf53b480065b51ca6f8fc |
27-Dec-2013 |
Baligh Uddin <baligh@google.com> |
am c36fa7f8: (-s ours) am 58ce8de3: (-s ours) am 6b48b5de: (-s ours) Import translations. DO NOT MERGE
* commit 'c36fa7f86e1c8f746b6c29d4bd2a88ba7bfa0dd4':
Import translations. DO NOT MERGE
|
| c36fa7f86e1c8f746b6c29d4bd2a88ba7bfa0dd4 |
27-Dec-2013 |
Baligh Uddin <baligh@google.com> |
am 58ce8de3: (-s ours) am 6b48b5de: (-s ours) Import translations. DO NOT MERGE
* commit '58ce8de3fbb0cfed369b6a38d0f5c92104745eb4':
Import translations. DO NOT MERGE
|
| 58ce8de3fbb0cfed369b6a38d0f5c92104745eb4 |
26-Dec-2013 |
Baligh Uddin <baligh@google.com> |
am 6b48b5de: (-s ours) Import translations. DO NOT MERGE
* commit '6b48b5de2bf992ea630e9584e206d0129ac9111e':
Import translations. DO NOT MERGE
|
| ad7bb0817486ec52d9c1451873c1220d9e5a0512 |
26-Dec-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: Ibcb3dafb5d326790ca66cc351648104cfba486c4
Auto-generated-cl: translation import
arousel/test/res/values-am/strings.xml
|
| 6b48b5de2bf992ea630e9584e206d0129ac9111e |
26-Dec-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: Ica62235d3952c75ce0f7eaae6b4e314094f48b19
Auto-generated-cl: translation import
arousel/test/res/values-am/strings.xml
|
| 16c2fc90384a901f442226f46eaa72c153189cc5 |
09-Dec-2013 |
Baligh Uddin <baligh@google.com> |
Remove deprecated locales (values-be)
Bug: 11412863
Change-Id: Ia377c1a61a5e9339173c9877cb78a6d6873c5ab0
arousel/test/res/values-be/strings.xml
hips/res/values-be/strings.xml
|
| 7a21dec19ae7fe9c3f7856cda12b0499ba2a1ccc |
20-Nov-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: Ia9a5e1d4d928ceff2b3bcac536c5745eca573597
Auto-generated-cl: translation import
arousel/test/res/values-be/strings.xml
hips/res/values-be/strings.xml
|
| fbe88af0fd898ddd4ada17e6506a04517193aaf6 |
14-Nov-2013 |
Baligh Uddin <baligh@google.com> |
Remove deprecated locale (be)
Bug: 11412863
Change-Id: Ia6619d96e4652816f173631a4a084b2ee8b2533a
arousel/test/res/values-be/strings.xml
hips/res/values-be/strings.xml
|
| 4fa4a3f4f790542781cdd2abd59b1cab18e5378d |
14-Nov-2013 |
Scott Kennedy <skennedy@google.com> |
am fdad3f16: am 5e3d1fa1: am 3e8176df: Don\'t show the alternates dialog for GAL contacts
* commit 'fdad3f160ed8c0de91b385df5d1eb8965e6be2a7':
Don't show the alternates dialog for GAL contacts
|
| fdad3f160ed8c0de91b385df5d1eb8965e6be2a7 |
14-Nov-2013 |
Scott Kennedy <skennedy@google.com> |
am 5e3d1fa1: am 3e8176df: Don\'t show the alternates dialog for GAL contacts
* commit '5e3d1fa142b5abb2623ab13cc30d85b50a561f4e':
Don't show the alternates dialog for GAL contacts
|
| 5e3d1fa142b5abb2623ab13cc30d85b50a561f4e |
14-Nov-2013 |
Scott Kennedy <skennedy@google.com> |
am 3e8176df: Don\'t show the alternates dialog for GAL contacts
* commit '3e8176df16950c067bcb1b37e62b2fc07d74065a':
Don't show the alternates dialog for GAL contacts
|
| 3e8176df16950c067bcb1b37e62b2fc07d74065a |
14-Nov-2013 |
Scott Kennedy <skennedy@google.com> |
Don't show the alternates dialog for GAL contacts
There's a bug in the chips code that causes this to show either no
alternates, or a different person, which is scaring people.
The proper future fix is to store some more information about GAL
contacts so we can do a proper lookup.
Bug: 11535331
Change-Id: Id8b6fc834446afe33bd6ec4e99b3d2b75b985bde
hips/src/com/android/ex/chips/BaseRecipientAdapter.java
hips/src/com/android/ex/chips/RecipientAlternatesAdapter.java
hips/src/com/android/ex/chips/RecipientEditTextView.java
hips/src/com/android/ex/chips/RecipientEntry.java
hips/src/com/android/ex/chips/recipientchip/BaseRecipientChip.java
hips/src/com/android/ex/chips/recipientchip/InvisibleRecipientChip.java
hips/src/com/android/ex/chips/recipientchip/SimpleRecipientChip.java
hips/src/com/android/ex/chips/recipientchip/VisibleRecipientChip.java
hips/tests/src/com/android/ex/chips/RecipientAlternatesAdapterTest.java
|
| 61068eae9176d5d0c49efd1c2f7f3f5ccde12d98 |
13-Nov-2013 |
Baligh Uddin <baligh@google.com> |
Remove deprecated locales.
Following locales have been replaced by locale+country code
et -> et-rEE
ms -> ms-rMY
km -> km-rKH
lo -> lo-rLA
hy -> hy-rAM
ka -> ka-rGE
mn -> mn-rMN
Bug: 11412863
Change-Id: I3ca4f564ef6dfcad562329171238b58871f280c3
arousel/test/res/values-et/strings.xml
arousel/test/res/values-hy/strings.xml
arousel/test/res/values-ka/strings.xml
arousel/test/res/values-km/strings.xml
arousel/test/res/values-lo/strings.xml
arousel/test/res/values-mn/strings.xml
arousel/test/res/values-ms/strings.xml
hips/res/values-et/strings.xml
hips/res/values-hy/strings.xml
hips/res/values-ka/strings.xml
hips/res/values-km/strings.xml
hips/res/values-lo/strings.xml
hips/res/values-mn/strings.xml
hips/res/values-ms/strings.xml
|
| 6889dfab1a88f584d6eeb91cd37e1ad09988961a |
08-Nov-2013 |
Ed Heyl <edheyl@google.com> |
am e0b8940b: am 4a17a810: am 72dbb5bf: merge in release branch changes (no-op).
* commit 'e0b8940b924359ee45bc8c755f666dd4bd370d16':
camera2: Add updateCaptureRequest method
camera2: Add #resetState to AutoFocusStateMachine
|
| e0b8940b924359ee45bc8c755f666dd4bd370d16 |
08-Nov-2013 |
Ed Heyl <edheyl@google.com> |
am 4a17a810: am 72dbb5bf: merge in release branch changes (no-op).
* commit '4a17a810422152367bece35c1756d8c553efc01f':
camera2: Add updateCaptureRequest method
camera2: Add #resetState to AutoFocusStateMachine
|
| 4a17a810422152367bece35c1756d8c553efc01f |
08-Nov-2013 |
Ed Heyl <edheyl@google.com> |
am 72dbb5bf: merge in release branch changes (no-op).
* commit '72dbb5bf7e2e40cc5c2a31d09b079cb053b1b639':
camera2: Add updateCaptureRequest method
camera2: Add #resetState to AutoFocusStateMachine
|
| 72dbb5bf7e2e40cc5c2a31d09b079cb053b1b639 |
08-Nov-2013 |
Ed Heyl <edheyl@google.com> |
merge in release branch changes (no-op).
|
| 301ff06a565c55404e472433c46f506e5bef2ee7 |
30-Oct-2013 |
Zhijun He <zhijunhe@google.com> |
camera2: Add updateCaptureRequest method
It can be used to update repeating request with current auto focus mode.
Bug: 10649854
Change-Id: I5e92218c61dea04990581d37f92bf25a1f8dbe91
amera2/public/src/com/android/ex/camera2/pos/AutoFocusStateMachine.java
|
| 7d1e2245d443faaf833c19e7e9c837112d618c68 |
06-Nov-2013 |
Igor Murashkin <iam@google.com> |
camera2: Add #resetState to AutoFocusStateMachine
Bug: 11071158
Change-Id: I24bc2d771703bb502dcbb676b6262954f2017630
amera2/public/src/com/android/ex/camera2/pos/AutoFocusStateMachine.java
|
| 44aacce1e8de2a82c69fa0e0293d26acd32824ae |
08-Nov-2013 |
Zhijun He <zhijunhe@google.com> |
am 400bcf43: am 0cc7337b: am 020e6d9b: Merge "camera2: Add updateCaptureRequest method" into klp-dev
* commit '400bcf435d003ee73c1bb97bafd8aca7d9b42544':
camera2: Add updateCaptureRequest method
|
| f5e6de4c0a2afecf825beb6881a650bab92d5010 |
08-Nov-2013 |
Igor Murashkin <iam@google.com> |
am 5e3b1f15: am 536308c3: am e2fa3d71: camera2: Add #resetState to AutoFocusStateMachine
* commit '5e3b1f15e9ce832587b020f9151e0df05d44f877':
camera2: Add #resetState to AutoFocusStateMachine
|
| 400bcf435d003ee73c1bb97bafd8aca7d9b42544 |
07-Nov-2013 |
Zhijun He <zhijunhe@google.com> |
am 0cc7337b: am 020e6d9b: Merge "camera2: Add updateCaptureRequest method" into klp-dev
* commit '0cc7337bac5b1e5368baa896afef0ed41490e69e':
camera2: Add updateCaptureRequest method
|
| 0cc7337bac5b1e5368baa896afef0ed41490e69e |
07-Nov-2013 |
Zhijun He <zhijunhe@google.com> |
am 020e6d9b: Merge "camera2: Add updateCaptureRequest method" into klp-dev
* commit '020e6d9bb46850ad39f14e575259a04887a2ea26':
camera2: Add updateCaptureRequest method
|
| 020e6d9bb46850ad39f14e575259a04887a2ea26 |
07-Nov-2013 |
Zhijun He <zhijunhe@google.com> |
Merge "camera2: Add updateCaptureRequest method" into klp-dev
|
| 5e3b1f15e9ce832587b020f9151e0df05d44f877 |
07-Nov-2013 |
Igor Murashkin <iam@google.com> |
am 536308c3: am e2fa3d71: camera2: Add #resetState to AutoFocusStateMachine
* commit '536308c30ace1070276ee88e9dcaf07802bd3b07':
camera2: Add #resetState to AutoFocusStateMachine
|
| 536308c30ace1070276ee88e9dcaf07802bd3b07 |
07-Nov-2013 |
Igor Murashkin <iam@google.com> |
am e2fa3d71: camera2: Add #resetState to AutoFocusStateMachine
* commit 'e2fa3d7185929f5e51a851d23db2618a41f18d9d':
camera2: Add #resetState to AutoFocusStateMachine
|
| d4429271623c05376ee1445d13fde9bcf76a0033 |
30-Oct-2013 |
Zhijun He <zhijunhe@google.com> |
camera2: Add updateCaptureRequest method
It can be used to update repeating request with current auto focus mode.
Bug: 10649854
Change-Id: I5e92218c61dea04990581d37f92bf25a1f8dbe91
amera2/public/src/com/android/ex/camera2/pos/AutoFocusStateMachine.java
|
| e2fa3d7185929f5e51a851d23db2618a41f18d9d |
06-Nov-2013 |
Igor Murashkin <iam@google.com> |
camera2: Add #resetState to AutoFocusStateMachine
Bug: 11071158
Change-Id: I24bc2d771703bb502dcbb676b6262954f2017630
amera2/public/src/com/android/ex/camera2/pos/AutoFocusStateMachine.java
|
| 6079ae66952fcfcdd3040d887645fcf0a2068d01 |
06-Nov-2013 |
Igor Murashkin <iam@google.com> |
am 5e1997a0: am ad9d6b03: am 2d8e55f4: camera2: Add tracing to AutoFocusStateMachine (lens-locking actions only)
* commit '5e1997a0e9775d70c42acb48c8333745a6b00b8c':
camera2: Add tracing to AutoFocusStateMachine (lens-locking actions only)
|
| 5e1997a0e9775d70c42acb48c8333745a6b00b8c |
06-Nov-2013 |
Igor Murashkin <iam@google.com> |
am ad9d6b03: am 2d8e55f4: camera2: Add tracing to AutoFocusStateMachine (lens-locking actions only)
* commit 'ad9d6b03b52fd9b2c82439c84a3919a862fb2c73':
camera2: Add tracing to AutoFocusStateMachine (lens-locking actions only)
|
| ad9d6b03b52fd9b2c82439c84a3919a862fb2c73 |
06-Nov-2013 |
Igor Murashkin <iam@google.com> |
am 2d8e55f4: camera2: Add tracing to AutoFocusStateMachine (lens-locking actions only)
* commit '2d8e55f45e52ac0b18c0e46de602e6a6d5ab1001':
camera2: Add tracing to AutoFocusStateMachine (lens-locking actions only)
|
| 2d8e55f45e52ac0b18c0e46de602e6a6d5ab1001 |
05-Nov-2013 |
Igor Murashkin <iam@google.com> |
camera2: Add tracing to AutoFocusStateMachine (lens-locking actions only)
Bug: 11071158
Change-Id: I6a1d0130b6ca36c853f539ef3f1afb363a70df24
amera2/public/src/com/android/ex/camera2/pos/AutoFocusStateMachine.java
|
| 3840bf87b9b439c32555fb05dba129a62e15b5e0 |
26-Oct-2013 |
Igor Murashkin <iam@google.com> |
am 98155f86: am 5e9746b7: am 1e125c71: Merge "gcam: Add empty SysTrace class" into klp-dev
* commit '98155f86616d9ba5230e908079dc66ab15892bdf':
gcam: Add empty SysTrace class
|
| 98155f86616d9ba5230e908079dc66ab15892bdf |
26-Oct-2013 |
Igor Murashkin <iam@google.com> |
am 5e9746b7: am 1e125c71: Merge "gcam: Add empty SysTrace class" into klp-dev
* commit '5e9746b7dbae512a98438cca58375bdebc8541ca':
gcam: Add empty SysTrace class
|
| 5e9746b7dbae512a98438cca58375bdebc8541ca |
26-Oct-2013 |
Igor Murashkin <iam@google.com> |
am 1e125c71: Merge "gcam: Add empty SysTrace class" into klp-dev
* commit '1e125c7179c4226702a0c5d7943380529187f989':
gcam: Add empty SysTrace class
|
| 1e125c7179c4226702a0c5d7943380529187f989 |
26-Oct-2013 |
Igor Murashkin <iam@google.com> |
Merge "gcam: Add empty SysTrace class" into klp-dev
|
| b513f30a1f2a705e547dec7dfe958102ccf19d93 |
21-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: Ib48fd46de9e17340b6f3a1164a173619f7225da9
Auto-generated-cl: translation import
hips/sample/res/values-af/strings.xml
hips/sample/res/values-am/strings.xml
hips/sample/res/values-ar/strings.xml
hips/sample/res/values-bg/strings.xml
hips/sample/res/values-ca/strings.xml
hips/sample/res/values-cs/strings.xml
hips/sample/res/values-da/strings.xml
hips/sample/res/values-de/strings.xml
hips/sample/res/values-el/strings.xml
hips/sample/res/values-en-rGB/strings.xml
hips/sample/res/values-en-rIN/strings.xml
hips/sample/res/values-es-rUS/strings.xml
hips/sample/res/values-es/strings.xml
hips/sample/res/values-et-rEE/strings.xml
hips/sample/res/values-fa/strings.xml
hips/sample/res/values-fi/strings.xml
hips/sample/res/values-fr-rCA/strings.xml
hips/sample/res/values-fr/strings.xml
hips/sample/res/values-hi/strings.xml
hips/sample/res/values-hr/strings.xml
hips/sample/res/values-hu/strings.xml
hips/sample/res/values-hy-rAM/strings.xml
hips/sample/res/values-in/strings.xml
hips/sample/res/values-it/strings.xml
hips/sample/res/values-iw/strings.xml
hips/sample/res/values-ja/strings.xml
hips/sample/res/values-ka-rGE/strings.xml
hips/sample/res/values-km-rKH/strings.xml
hips/sample/res/values-ko/strings.xml
hips/sample/res/values-lo-rLA/strings.xml
hips/sample/res/values-lt/strings.xml
hips/sample/res/values-lv/strings.xml
hips/sample/res/values-mn-rMN/strings.xml
hips/sample/res/values-ms-rMY/strings.xml
hips/sample/res/values-nb/strings.xml
hips/sample/res/values-nl/strings.xml
hips/sample/res/values-pl/strings.xml
hips/sample/res/values-pt-rPT/strings.xml
hips/sample/res/values-pt/strings.xml
hips/sample/res/values-ro/strings.xml
hips/sample/res/values-ru/strings.xml
hips/sample/res/values-sk/strings.xml
hips/sample/res/values-sl/strings.xml
hips/sample/res/values-sr/strings.xml
hips/sample/res/values-sv/strings.xml
hips/sample/res/values-sw/strings.xml
hips/sample/res/values-th/strings.xml
hips/sample/res/values-tl/strings.xml
hips/sample/res/values-tr/strings.xml
hips/sample/res/values-uk/strings.xml
hips/sample/res/values-vi/strings.xml
hips/sample/res/values-zh-rCN/strings.xml
hips/sample/res/values-zh-rHK/strings.xml
hips/sample/res/values-zh-rTW/strings.xml
hips/sample/res/values-zu/strings.xml
|
| 30662b3366c815603d3ed61dc3868e0ea40788e7 |
18-Oct-2013 |
Igor Murashkin <iam@google.com> |
gcam: Add empty SysTrace class
Bug: 11071158
Change-Id: I31f8c449dc4c47c610b0ef3c24849e0402634c86
amera2/public/src/com/android/ex/camera2/utils/SysTrace.java
|
| 7b2821e596ca30d49cab5dc79688dbf93886f88f |
18-Oct-2013 |
Scott Kennedy <skennedy@google.com> |
am b7ceb9ae: am 5dab3464: Don\'t translate "Chips Sample"
* commit 'b7ceb9ae898be3eff2d7dcad18667cef2abc3e7e':
Don't translate "Chips Sample"
|
| b7ceb9ae898be3eff2d7dcad18667cef2abc3e7e |
18-Oct-2013 |
Scott Kennedy <skennedy@google.com> |
am 5dab3464: Don\'t translate "Chips Sample"
* commit '5dab3464860a47cca5dce934dd184dc0f02a58ed':
Don't translate "Chips Sample"
|
| 5dab3464860a47cca5dce934dd184dc0f02a58ed |
18-Oct-2013 |
Scott Kennedy <skennedy@google.com> |
Don't translate "Chips Sample"
Change-Id: I9a6289522adab470866ff10777f7d2bd00e51999
hips/sample/res/values/strings.xml
|
| e44f94d82aa58874b1d87c0d0068e58b9fc3a7de |
17-Oct-2013 |
Igor Murashkin <iam@google.com> |
am 86c1b41e: am 93d176ff: am 806d114d: camera2: Harden AutoFocusStateMachine against null values in callbacks
* commit '86c1b41e186605c60b4b688a0a32443fe61e98f5':
camera2: Harden AutoFocusStateMachine against null values in callbacks
|
| 86c1b41e186605c60b4b688a0a32443fe61e98f5 |
17-Oct-2013 |
Igor Murashkin <iam@google.com> |
am 93d176ff: am 806d114d: camera2: Harden AutoFocusStateMachine against null values in callbacks
* commit '93d176ff41e0df9f3dd47e313497c3d6bf93bff8':
camera2: Harden AutoFocusStateMachine against null values in callbacks
|
| 93d176ff41e0df9f3dd47e313497c3d6bf93bff8 |
17-Oct-2013 |
Igor Murashkin <iam@google.com> |
am 806d114d: camera2: Harden AutoFocusStateMachine against null values in callbacks
* commit '806d114d5975c89843c9ba16eadfcaf143afdebb':
camera2: Harden AutoFocusStateMachine against null values in callbacks
|
| 806d114d5975c89843c9ba16eadfcaf143afdebb |
17-Oct-2013 |
Igor Murashkin <iam@google.com> |
camera2: Harden AutoFocusStateMachine against null values in callbacks
Bug: 11269834
Change-Id: Id3cb85eb3e9aaaf6714fd81a5d53811d4cbfefa9
amera2/public/src/com/android/ex/camera2/pos/AutoFocusStateMachine.java
|
| cf73211f765c33da77b22968fdad911663d27d9d |
16-Oct-2013 |
Tony Mantler <nicoya@google.com> |
am a41a6d0e: am 926c9905: am e444c661: am eaf43ea2: Don\'t show pop-ups and dialogs if we\'re not attached to a valid window.
* commit 'a41a6d0e4a840ce23a9fe12e5b27c477fa7b05b8':
Don't show pop-ups and dialogs if we're not attached to a valid window.
|
| a41a6d0e4a840ce23a9fe12e5b27c477fa7b05b8 |
16-Oct-2013 |
Tony Mantler <nicoya@google.com> |
am 926c9905: am e444c661: am eaf43ea2: Don\'t show pop-ups and dialogs if we\'re not attached to a valid window.
* commit '926c990518364dd2e292c6e41887607d9bb910a0':
Don't show pop-ups and dialogs if we're not attached to a valid window.
|
| 926c990518364dd2e292c6e41887607d9bb910a0 |
16-Oct-2013 |
Tony Mantler <nicoya@google.com> |
am e444c661: am eaf43ea2: Don\'t show pop-ups and dialogs if we\'re not attached to a valid window.
* commit 'e444c661c53b942eea0daa120b3e5dcc58a0bdbe':
Don't show pop-ups and dialogs if we're not attached to a valid window.
|
| e444c661c53b942eea0daa120b3e5dcc58a0bdbe |
16-Oct-2013 |
Tony Mantler <nicoya@google.com> |
am eaf43ea2: Don\'t show pop-ups and dialogs if we\'re not attached to a valid window.
* commit 'eaf43ea2c3b00af22f0aa106fd3dde142f52d471':
Don't show pop-ups and dialogs if we're not attached to a valid window.
|
| ae6930b3141c07bc6e4ecf206810bb3256968a99 |
16-Oct-2013 |
Igor Murashkin <iam@google.com> |
am 5ba33b0b: am 7d297cff: am ba7f0254: camera2: Skip AF state updates when afMode/afState are missing
* commit '5ba33b0be247dfe60835dd8be87766a66949517d':
camera2: Skip AF state updates when afMode/afState are missing
|
| 5ba33b0be247dfe60835dd8be87766a66949517d |
16-Oct-2013 |
Igor Murashkin <iam@google.com> |
am 7d297cff: am ba7f0254: camera2: Skip AF state updates when afMode/afState are missing
* commit '7d297cffc90a63944525cf6a6eab7bd76e287b35':
camera2: Skip AF state updates when afMode/afState are missing
|
| 7d297cffc90a63944525cf6a6eab7bd76e287b35 |
16-Oct-2013 |
Igor Murashkin <iam@google.com> |
am ba7f0254: camera2: Skip AF state updates when afMode/afState are missing
* commit 'ba7f02549047afd96f033eda9729592a7668e039':
camera2: Skip AF state updates when afMode/afState are missing
|
| eaf43ea2c3b00af22f0aa106fd3dde142f52d471 |
15-Oct-2013 |
Tony Mantler <nicoya@google.com> |
Don't show pop-ups and dialogs if we're not attached to a valid window.
b/11229200
Change-Id: Ic44da79e441017ac4ccdb4a254c13965da0cc2f9
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| ba7f02549047afd96f033eda9729592a7668e039 |
15-Oct-2013 |
Igor Murashkin <iam@google.com> |
camera2: Skip AF state updates when afMode/afState are missing
* Workaround for hal3 sometimes dropping afMode/afState (rarely)
- don't update AF states, instead just skip this frame, safer
and adds 1 frame of latency very rarely sometimes.
* Assumes request is repeating, since otherwise we wouldn't get future
af transition results
Bug: 11238865
Change-Id: Ic793d8c6d44873f6a7983e84e4510b8587a148a0
amera2/public/src/com/android/ex/camera2/pos/AutoFocusStateMachine.java
|
| b6a57b4b97a174049eeb9148240b3363902bff6d |
14-Oct-2013 |
Eino-Ville Talvala <etalvala@google.com> |
am f7fdaf86: am 35beb4e5: am 7705b0b8: Revert "Revert "Camera2: Use hidden APIs""
* commit 'f7fdaf86909f8087e33f8d24964a9733435f2d7a':
Revert "Revert "Camera2: Use hidden APIs""
|
| f7fdaf86909f8087e33f8d24964a9733435f2d7a |
13-Oct-2013 |
Eino-Ville Talvala <etalvala@google.com> |
am 35beb4e5: am 7705b0b8: Revert "Revert "Camera2: Use hidden APIs""
* commit '35beb4e5cdb4f7c89120f1836f94d07eb0e6ac6e':
Revert "Revert "Camera2: Use hidden APIs""
|
| 35beb4e5cdb4f7c89120f1836f94d07eb0e6ac6e |
13-Oct-2013 |
Eino-Ville Talvala <etalvala@google.com> |
am 7705b0b8: Revert "Revert "Camera2: Use hidden APIs""
* commit '7705b0b80a3f432c59d1e1892ca3751e89508aed':
Revert "Revert "Camera2: Use hidden APIs""
|
| 7705b0b80a3f432c59d1e1892ca3751e89508aed |
11-Oct-2013 |
Eino-Ville Talvala <etalvala@google.com> |
Revert "Revert "Camera2: Use hidden APIs""
Play it again, Gerrit.
This reverts commit 08f250d97f3cd9d4a26983725f82b9f88ea4b9d8.
Bug: 11141002
amera2/public/Android.mk
|
| ca0a4a543ca13501132945a6e1c2ab349a0c77de |
11-Oct-2013 |
Eino-Ville Talvala <etalvala@google.com> |
am 76978a04: am 6102db91: am 08f250d9: Revert "Camera2: Use hidden APIs"
* commit '76978a040c690213e937d8301bc1df29b611f1a9':
Revert "Camera2: Use hidden APIs"
|
| 76978a040c690213e937d8301bc1df29b611f1a9 |
11-Oct-2013 |
Eino-Ville Talvala <etalvala@google.com> |
am 6102db91: am 08f250d9: Revert "Camera2: Use hidden APIs"
* commit '6102db9188b8b37744a8342c101eb988ae4a0f81':
Revert "Camera2: Use hidden APIs"
|
| 6102db9188b8b37744a8342c101eb988ae4a0f81 |
11-Oct-2013 |
Eino-Ville Talvala <etalvala@google.com> |
am 08f250d9: Revert "Camera2: Use hidden APIs"
* commit '08f250d97f3cd9d4a26983725f82b9f88ea4b9d8':
Revert "Camera2: Use hidden APIs"
|
| 08f250d97f3cd9d4a26983725f82b9f88ea4b9d8 |
11-Oct-2013 |
Eino-Ville Talvala <etalvala@google.com> |
Revert "Camera2: Use hidden APIs"
This reverts commit 51bb20d6396609a61aff93e9e7b9f878aa0bcee3.
Change-Id: Iafc4f7a3834fd1ea781ed5f423efbde95c160fe6
amera2/public/Android.mk
|
| 7b80334d345e6db6880d0cfd530a0a56d529fa99 |
11-Oct-2013 |
Eino-Ville Talvala <etalvala@google.com> |
am 8390c35f: am 26825617: am 51bb20d6: Camera2: Use hidden APIs
* commit '8390c35f8522c55625f2ad4086cd35fb317207c7':
Camera2: Use hidden APIs
|
| 8390c35f8522c55625f2ad4086cd35fb317207c7 |
11-Oct-2013 |
Eino-Ville Talvala <etalvala@google.com> |
am 26825617: am 51bb20d6: Camera2: Use hidden APIs
* commit '26825617d0cc06edeeb458977cba831657970b2d':
Camera2: Use hidden APIs
|
| 26825617d0cc06edeeb458977cba831657970b2d |
11-Oct-2013 |
Eino-Ville Talvala <etalvala@google.com> |
am 51bb20d6: Camera2: Use hidden APIs
* commit '51bb20d6396609a61aff93e9e7b9f878aa0bcee3':
Camera2: Use hidden APIs
|
| e8f64dd6272dbb4d7543686588aa0536cee5068b |
10-Oct-2013 |
Scott Kennedy <skennedy@google.com> |
am 0c8f9ac7: am 490e81a7: Merge chips from jb-ub-mail-ur11 into klp-ub-dev
* commit '0c8f9ac7cb24ce655e660096332605138ec70542':
Merge chips from jb-ub-mail-ur11 into klp-ub-dev
|
| 0c8f9ac7cb24ce655e660096332605138ec70542 |
10-Oct-2013 |
Scott Kennedy <skennedy@google.com> |
am 490e81a7: Merge chips from jb-ub-mail-ur11 into klp-ub-dev
* commit '490e81a7b32f92de40debd62122dd3c793dc52ec':
Merge chips from jb-ub-mail-ur11 into klp-ub-dev
|
| 490e81a7b32f92de40debd62122dd3c793dc52ec |
10-Oct-2013 |
Scott Kennedy <skennedy@google.com> |
Merge chips from jb-ub-mail-ur11 into klp-ub-dev
Change-Id: Ied8877d7613ca1dbb5047a0c8c611a1138fc47e3
hips/project.properties
hips/sample/Android.mk
hips/sample/AndroidManifest.xml
hips/sample/res/drawable-hdpi/ic_launcher.png
hips/sample/res/drawable-mdpi/ic_launcher.png
hips/sample/res/drawable-xhdpi/ic_launcher.png
hips/sample/res/layout/activity_main.xml
hips/sample/res/values-af/strings.xml
hips/sample/res/values-am/strings.xml
hips/sample/res/values-ar/strings.xml
hips/sample/res/values-bg/strings.xml
hips/sample/res/values-ca/strings.xml
hips/sample/res/values-cs/strings.xml
hips/sample/res/values-da/strings.xml
hips/sample/res/values-de/strings.xml
hips/sample/res/values-el/strings.xml
hips/sample/res/values-en-rGB/strings.xml
hips/sample/res/values-en-rIN/strings.xml
hips/sample/res/values-es-rUS/strings.xml
hips/sample/res/values-es/strings.xml
hips/sample/res/values-et-rEE/strings.xml
hips/sample/res/values-fa/strings.xml
hips/sample/res/values-fi/strings.xml
hips/sample/res/values-fr-rCA/strings.xml
hips/sample/res/values-fr/strings.xml
hips/sample/res/values-hi/strings.xml
hips/sample/res/values-hr/strings.xml
hips/sample/res/values-hu/strings.xml
hips/sample/res/values-hy-rAM/strings.xml
hips/sample/res/values-in/strings.xml
hips/sample/res/values-it/strings.xml
hips/sample/res/values-iw/strings.xml
hips/sample/res/values-ja/strings.xml
hips/sample/res/values-ka-rGE/strings.xml
hips/sample/res/values-km-rKH/strings.xml
hips/sample/res/values-ko/strings.xml
hips/sample/res/values-lo-rLA/strings.xml
hips/sample/res/values-lt/strings.xml
hips/sample/res/values-lv/strings.xml
hips/sample/res/values-mn-rMN/strings.xml
hips/sample/res/values-ms-rMY/strings.xml
hips/sample/res/values-nb/strings.xml
hips/sample/res/values-nl/strings.xml
hips/sample/res/values-pl/strings.xml
hips/sample/res/values-pt-rPT/strings.xml
hips/sample/res/values-pt/strings.xml
hips/sample/res/values-ro/strings.xml
hips/sample/res/values-ru/strings.xml
hips/sample/res/values-sk/strings.xml
hips/sample/res/values-sl/strings.xml
hips/sample/res/values-sr/strings.xml
hips/sample/res/values-sv/strings.xml
hips/sample/res/values-sw/strings.xml
hips/sample/res/values-th/strings.xml
hips/sample/res/values-tl/strings.xml
hips/sample/res/values-tr/strings.xml
hips/sample/res/values-uk/strings.xml
hips/sample/res/values-vi/strings.xml
hips/sample/res/values-zh-rCN/strings.xml
hips/sample/res/values-zh-rHK/strings.xml
hips/sample/res/values-zh-rTW/strings.xml
hips/sample/res/values-zu/strings.xml
hips/sample/res/values/strings.xml
hips/sample/src/com/android/ex/chips/sample/MainActivity.java
hips/src/com/android/ex/chips/BaseRecipientAdapter.java
hips/src/com/android/ex/chips/RecipientEditTextView.java
hips/tests/AndroidManifest.xml
hips/tests/src/com/android/ex/chips/ChipsTest.java
|
| 51bb20d6396609a61aff93e9e7b9f878aa0bcee3 |
08-Oct-2013 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Use hidden APIs
Bug: 11141002
Change-Id: I351460e418c0084258984694c0289ef54250100f
amera2/public/Android.mk
|
| 97c9c967d7c67d5f5a188d47e2fedb245d3fa72a |
07-Oct-2013 |
Eino-Ville Talvala <etalvala@google.com> |
am a2658223: am 44bd229d: am a25c5599: Camera2: Add a blocking state listener
* commit 'a2658223260c6f7243c479fc07a01010ef5cdacb':
Camera2: Add a blocking state listener
|
| a2658223260c6f7243c479fc07a01010ef5cdacb |
07-Oct-2013 |
Eino-Ville Talvala <etalvala@google.com> |
am 44bd229d: am a25c5599: Camera2: Add a blocking state listener
* commit '44bd229d71fdea7b01cbe66ef54f0d30ff140e26':
Camera2: Add a blocking state listener
|
| 44bd229d71fdea7b01cbe66ef54f0d30ff140e26 |
07-Oct-2013 |
Eino-Ville Talvala <etalvala@google.com> |
am a25c5599: Camera2: Add a blocking state listener
* commit 'a25c5599003b9e95cec566a94be6932bc42c00d3':
Camera2: Add a blocking state listener
|
| a25c5599003b9e95cec566a94be6932bc42c00d3 |
04-Oct-2013 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Add a blocking state listener
- Provides wait() methods for waiting on a desired state to be reached
- Only one waiter at a time
Bug: 10360518
Change-Id: Iab114584dfa4ab34c7a7b31ed243a3f6a3fc9c58
amera2/public/src/com/android/ex/camera2/blocking/BlockingStateListener.java
|
| 385d4b78f7afe2a19a0b950927a25f6e49a34b75 |
06-Oct-2013 |
Igor Murashkin <iam@google.com> |
am 6bc47adb: am 15a49e43: am a47d6986: gcam: Make AF more tolerant to transitioning into same state
* commit '6bc47adbd8cc36843cc9bb8e5a865283499cd119':
gcam: Make AF more tolerant to transitioning into same state
|
| 6bc47adbd8cc36843cc9bb8e5a865283499cd119 |
06-Oct-2013 |
Igor Murashkin <iam@google.com> |
am 15a49e43: am a47d6986: gcam: Make AF more tolerant to transitioning into same state
* commit '15a49e431b3b55a428065fbf0c74d53673508c24':
gcam: Make AF more tolerant to transitioning into same state
|
| 15a49e431b3b55a428065fbf0c74d53673508c24 |
06-Oct-2013 |
Igor Murashkin <iam@google.com> |
am a47d6986: gcam: Make AF more tolerant to transitioning into same state
* commit 'a47d6986cb4aa66e277c61df79a3947bbecd5de8':
gcam: Make AF more tolerant to transitioning into same state
|
| a47d6986cb4aa66e277c61df79a3947bbecd5de8 |
05-Oct-2013 |
Igor Murashkin <iam@google.com> |
gcam: Make AF more tolerant to transitioning into same state
Bug: 11014205
Change-Id: I669873307943bfdfbe67e688d1b2de24acd87550
amera2/public/src/com/android/ex/camera2/pos/AutoFocusStateMachine.java
|
| dbbf87fdcf5adde06a7c8c0421fb71523090f0ce |
05-Oct-2013 |
Igor Murashkin <iam@google.com> |
am 6b9345ec: am 08dbbb52: am 9fcc8956: Merge "camera2: Add passive unfocused state to AF state machine" into klp-dev
* commit '6b9345ece254eeff0a0ef542728e8964317fcbb7':
camera2: Add passive unfocused state to AF state machine
|
| 6b9345ece254eeff0a0ef542728e8964317fcbb7 |
05-Oct-2013 |
Igor Murashkin <iam@google.com> |
am 08dbbb52: am 9fcc8956: Merge "camera2: Add passive unfocused state to AF state machine" into klp-dev
* commit '08dbbb52f0424ae652eb4e8888b056e0adffe615':
camera2: Add passive unfocused state to AF state machine
|
| 08dbbb52f0424ae652eb4e8888b056e0adffe615 |
05-Oct-2013 |
Igor Murashkin <iam@google.com> |
am 9fcc8956: Merge "camera2: Add passive unfocused state to AF state machine" into klp-dev
* commit '9fcc8956f5a993ae4fda21d1939b1ea6f3d2e4ad':
camera2: Add passive unfocused state to AF state machine
|
| 9fcc8956f5a993ae4fda21d1939b1ea6f3d2e4ad |
05-Oct-2013 |
Igor Murashkin <iam@google.com> |
Merge "camera2: Add passive unfocused state to AF state machine" into klp-dev
|
| 134cd3193ddc17e97cb6364594d85e5b203c7cc6 |
04-Oct-2013 |
Igor Murashkin <iam@google.com> |
camera2: Add passive unfocused state to AF state machine
* Also fix minor issue where passive focused state was falsely locking
Bug: 11014205
Change-Id: Ic53e455693aa4f14d776658625d4ba8fa7dc2f51
amera2/public/src/com/android/ex/camera2/pos/AutoFocusStateMachine.java
|
| 78ba442e36eb5d4b9173fed99aeafea2489e7fdb |
04-Oct-2013 |
Baligh Uddin <baligh@google.com> |
am 3a50b9e1: (-s ours) am a2ba4d5a: (-s ours) am 19411cda: (-s ours) am da5cd8c4: (-s ours) Import translations. DO NOT MERGE
* commit '3a50b9e1a2e59b9eceb450c52c371beaa38d3d65':
Import translations. DO NOT MERGE
|
| 3a50b9e1a2e59b9eceb450c52c371beaa38d3d65 |
04-Oct-2013 |
Baligh Uddin <baligh@google.com> |
am a2ba4d5a: (-s ours) am 19411cda: (-s ours) am da5cd8c4: (-s ours) Import translations. DO NOT MERGE
* commit 'a2ba4d5aeef7dd13c2861c675039357838392fe2':
Import translations. DO NOT MERGE
|
| a2ba4d5aeef7dd13c2861c675039357838392fe2 |
04-Oct-2013 |
Baligh Uddin <baligh@google.com> |
am 19411cda: (-s ours) am da5cd8c4: (-s ours) Import translations. DO NOT MERGE
* commit '19411cdaa36a2b1da6144eb955792b26296baf52':
Import translations. DO NOT MERGE
|
| 19411cdaa36a2b1da6144eb955792b26296baf52 |
04-Oct-2013 |
Baligh Uddin <baligh@google.com> |
am da5cd8c4: (-s ours) Import translations. DO NOT MERGE
* commit 'da5cd8c434eb4a4c5083a0ad0e2808c5ced58ea0':
Import translations. DO NOT MERGE
|
| da5cd8c434eb4a4c5083a0ad0e2808c5ced58ea0 |
04-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: I288fc01b87fa8b157e0638fd2f230902d226acce
Auto-generated-cl: translation import
arousel/test/res/values-en-rIN/strings.xml
arousel/test/res/values-et-rEE/strings.xml
arousel/test/res/values-fr-rCA/strings.xml
arousel/test/res/values-hy-rAM/strings.xml
arousel/test/res/values-iw/strings.xml
arousel/test/res/values-ka-rGE/strings.xml
arousel/test/res/values-km-rKH/strings.xml
arousel/test/res/values-lo-rLA/strings.xml
arousel/test/res/values-mn-rMN/strings.xml
arousel/test/res/values-ms-rMY/strings.xml
arousel/test/res/values-nb/strings.xml
arousel/test/res/values-zh-rHK/strings.xml
hips/res/values-en-rIN/strings.xml
hips/res/values-et-rEE/strings.xml
hips/res/values-fr-rCA/strings.xml
hips/res/values-hy-rAM/strings.xml
hips/res/values-ka-rGE/strings.xml
hips/res/values-km-rKH/strings.xml
hips/res/values-lo-rLA/strings.xml
hips/res/values-mn-rMN/strings.xml
hips/res/values-ms-rMY/strings.xml
hips/res/values-sw/strings.xml
hips/res/values-zh-rHK/strings.xml
|
| b7289e33f94b62ef1bb5ca7ff8d33d645d647c16 |
02-Oct-2013 |
Igor Murashkin <iam@google.com> |
am 8fee1a5a: am 6c5cc576: Merge "camera2: Add state machine for doing auto-focus easily from apps" into klp-dev
* commit '8fee1a5ae5cea6f5eaf5d29a2e8793122df6c7a3':
|
| e88d7fe6975b037909879f96eeae128e308ef508 |
02-Oct-2013 |
Igor Murashkin <iam@google.com> |
am 6c5cc576: Merge "camera2: Add state machine for doing auto-focus easily from apps" into klp-dev
* commit '6c5cc576e747a38cf6feef39a578d9cccb0ba251':
camera2: Add state machine for doing auto-focus easily from apps
|
| 8fee1a5ae5cea6f5eaf5d29a2e8793122df6c7a3 |
01-Oct-2013 |
Igor Murashkin <iam@google.com> |
am 6c5cc576: Merge "camera2: Add state machine for doing auto-focus easily from apps" into klp-dev
* commit '6c5cc576e747a38cf6feef39a578d9cccb0ba251':
camera2: Add state machine for doing auto-focus easily from apps
|
| 6c5cc576e747a38cf6feef39a578d9cccb0ba251 |
29-Sep-2013 |
Igor Murashkin <iam@google.com> |
Merge "camera2: Add state machine for doing auto-focus easily from apps" into klp-dev
|
| 35216c7afb58dea26f454371e7b8dac9f742295b |
25-Sep-2013 |
Baligh Uddin <baligh@google.com> |
am 515b0b54: (-s ours) am 30028a02: (-s ours) Import translations. DO NOT MERGE
* commit '515b0b54b06c0515c21cbc7b3949b4e5485e7ad5':
Import translations. DO NOT MERGE
|
| 515b0b54b06c0515c21cbc7b3949b4e5485e7ad5 |
25-Sep-2013 |
Baligh Uddin <baligh@google.com> |
am 30028a02: (-s ours) Import translations. DO NOT MERGE
* commit '30028a02ca2addf3a072a02204592e02313a736a':
Import translations. DO NOT MERGE
|
| 30028a02ca2addf3a072a02204592e02313a736a |
25-Sep-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: I37d473e0fad705d9e5cd5573c37dbce9bf1eb32e
Auto-generated-cl: translation import
arousel/test/res/values-iw/strings.xml
|
| fc121178a18d0860d020e9cb2253c5b00dbf19c3 |
25-Sep-2013 |
Igor Murashkin <iam@google.com> |
camera2: Add state machine for doing auto-focus easily from apps
Bug: 10890749
Change-Id: I966768bdcdbb2876d44eefc2156e7aca64c4e601
amera2/public/src/com/android/ex/camera2/pos/AutoFocusStateMachine.java
|
| b0c4eea2c6156d6115ea4b36473115c8e85f7131 |
21-Sep-2013 |
Igor Murashkin <iam@google.com> |
am f295cb24: am 07f09b47: camera2: New directory with camera2 extras/helpers
* commit 'f295cb24ffb78ce24f7fb7ea2b7f1f9474e7fe3d':
camera2: New directory with camera2 extras/helpers
|
| f295cb24ffb78ce24f7fb7ea2b7f1f9474e7fe3d |
21-Sep-2013 |
Igor Murashkin <iam@google.com> |
am 07f09b47: camera2: New directory with camera2 extras/helpers
* commit '07f09b47112dc1094649da00f7e86024b67d5777':
camera2: New directory with camera2 extras/helpers
|
| 07f09b47112dc1094649da00f7e86024b67d5777 |
20-Sep-2013 |
Igor Murashkin <iam@google.com> |
camera2: New directory with camera2 extras/helpers
* Simplify using camera2 when possible
* Offer a blocking openCamera call to not have to deal with listeners
Bug: 10360518
Change-Id: I7f154db3a5300437785d6e8d0bfff5499ef9bc15
amera2/Android.mk
amera2/public/Android.mk
amera2/public/src/com/android/ex/camera2/blocking/BlockingCameraManager.java
amera2/public/src/com/android/ex/camera2/exceptions/TimeoutRuntimeException.java
|
| 848a8fc210c4c9268d8ea3b7f552a53716c5a1d6 |
19-Sep-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: I505fb183ef41641fe7c6c40f9bb31a3276f8381b
Auto-generated-cl: translation import
arousel/test/res/values-iw/strings.xml
|
| e26c981fab9bb63c0baa6284e94dde3ef63fd793 |
15-Sep-2013 |
Baligh Uddin <baligh@google.com> |
am fc62ce02: (-s ours) am 432e542f: (-s ours) Import translations. DO NOT MERGE
* commit 'fc62ce026ef137c482ecb637fc5e0909c524f5df':
Import translations. DO NOT MERGE
|
| fc62ce026ef137c482ecb637fc5e0909c524f5df |
15-Sep-2013 |
Baligh Uddin <baligh@google.com> |
am 432e542f: (-s ours) Import translations. DO NOT MERGE
* commit '432e542fc574cc5ff42cd964bc645789b13786f6':
Import translations. DO NOT MERGE
|
| 432e542fc574cc5ff42cd964bc645789b13786f6 |
15-Sep-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: I2232e476c87dd819bd6b8c785332fbb5b1f49738
Auto-generated-cl: translation import
arousel/test/res/values-en-rIN/strings.xml
arousel/test/res/values-et-rEE/strings.xml
arousel/test/res/values-fr-rCA/strings.xml
arousel/test/res/values-hy-rAM/strings.xml
arousel/test/res/values-ka-rGE/strings.xml
arousel/test/res/values-km-rKH/strings.xml
arousel/test/res/values-lo-rLA/strings.xml
arousel/test/res/values-mn-rMN/strings.xml
arousel/test/res/values-ms-rMY/strings.xml
arousel/test/res/values-nb/strings.xml
arousel/test/res/values-zh-rHK/strings.xml
hips/res/values-en-rIN/strings.xml
hips/res/values-et-rEE/strings.xml
hips/res/values-fr-rCA/strings.xml
hips/res/values-hy-rAM/strings.xml
hips/res/values-ka-rGE/strings.xml
hips/res/values-km-rKH/strings.xml
hips/res/values-lo-rLA/strings.xml
hips/res/values-mn-rMN/strings.xml
hips/res/values-ms-rMY/strings.xml
hips/res/values-zh-rHK/strings.xml
|
| 109c6f5fa77062d43469d2fce6a4f5c3e9b13c87 |
29-Aug-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: I009be1df92820ccc7471a68720e87ec7aaf6bdb2
Auto-generated-cl: translation import
arousel/test/res/values-az-rAZ/strings.xml
arousel/test/res/values-mn-rMN/strings.xml
hips/res/values-az-rAZ/strings.xml
hips/res/values-mn-rMN/strings.xml
|
| c7001409187b6c98de2524a8eab8e177011fcc03 |
28-Aug-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
| 14f4958d503c89401df84a92b7ea8915961d3e9b |
27-Aug-2013 |
Alon Albert <aalbert@google.com> |
am 6418de9f: Merge "Refactor List<Partition> to Partition[]" into klp-dev
* commit '6418de9f22adfa02bcf576e6397a8b740f515572':
Refactor List<Partition> to Partition[]
|
| 6418de9f22adfa02bcf576e6397a8b740f515572 |
27-Aug-2013 |
Alon Albert <aalbert@google.com> |
Merge "Refactor List<Partition> to Partition[]" into klp-dev
|
| 9a4f02a8eaf7eb3991900231dbea250e4fb34553 |
26-Aug-2013 |
Alon Albert <aalbert@google.com> |
Refactor List<Partition> to Partition[]
And add an addPartition(int location, Partition partition) method.
The refactoring make adding this method much easier.
Change-Id: Ife051b19837c2719e9487d7bc4f14095e76cc141
ommon/java/com/android/common/widget/CompositeCursorAdapter.java
|
| 8291f3bebe431f91450a0a3600d0a71262231a07 |
26-Aug-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: I383364c5c4c5945496ddd5fbe3cf376430d50043
Auto-generated-cl: translation import
arousel/test/res/values-et-rEE/strings.xml
arousel/test/res/values-hy-rAM/strings.xml
arousel/test/res/values-ka-rGE/strings.xml
arousel/test/res/values-km-rKH/strings.xml
arousel/test/res/values-lo-rLA/strings.xml
arousel/test/res/values-ms-rMY/strings.xml
arousel/test/res/values-ne-rNP/strings.xml
arousel/test/res/values-si-rLK/strings.xml
hips/res/values-et-rEE/strings.xml
hips/res/values-hy-rAM/strings.xml
hips/res/values-ka-rGE/strings.xml
hips/res/values-km-rKH/strings.xml
hips/res/values-lo-rLA/strings.xml
hips/res/values-ms-rMY/strings.xml
hips/res/values-ne-rNP/strings.xml
hips/res/values-si-rLK/strings.xml
|
| fa9b0c6d4920671fd8ade0557201d51d1be0d95b |
23-Aug-2013 |
Scott Kennedy <skennedy@google.com> |
am e407bff4: am 3be35a39: Remove some unused resources and imports
* commit 'e407bff4896dfe7f43fc955d35ee40b321b8cc83':
Remove some unused resources and imports
|
| e407bff4896dfe7f43fc955d35ee40b321b8cc83 |
23-Aug-2013 |
Scott Kennedy <skennedy@google.com> |
am 3be35a39: Remove some unused resources and imports
* commit '3be35a398afee202a794134920782db901ee36cd':
Remove some unused resources and imports
|
| 3be35a398afee202a794134920782db901ee36cd |
23-Aug-2013 |
Scott Kennedy <skennedy@google.com> |
Remove some unused resources and imports
Change-Id: Ifc9bbd7fa53972b4d2bd61d04a426017a6bd63f5
hips/list_selector_pressed_holo_dark.9.png
hips/res/drawable-hdpi/bg_separator.9.png
hips/res/drawable-hdpi/chip_checkmark.png
hips/res/drawable-mdpi/bg_separator.9.png
hips/res/drawable-mdpi/chip_checkmark.png
hips/res/drawable/bg_separator_inset.xml
hips/src/com/android/ex/chips/BaseRecipientAdapter.java
|
| 328b133b28fe17758b75b04b898c74207551909f |
19-Aug-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: Id6811ddabfaf683b62b4a55074421c7c66972d39
Auto-generated-cl: translation import
arousel/test/res/values-az/strings.xml
arousel/test/res/values-en-rIN/strings.xml
arousel/test/res/values-fr-rCA/strings.xml
arousel/test/res/values-hy/strings.xml
arousel/test/res/values-ka/strings.xml
arousel/test/res/values-km/strings.xml
arousel/test/res/values-lo/strings.xml
arousel/test/res/values-mn/strings.xml
arousel/test/res/values-ne/strings.xml
arousel/test/res/values-si/strings.xml
arousel/test/res/values-zh-rHK/strings.xml
hips/res/values-az/strings.xml
hips/res/values-en-rIN/strings.xml
hips/res/values-fr-rCA/strings.xml
hips/res/values-hy/strings.xml
hips/res/values-ka/strings.xml
hips/res/values-km/strings.xml
hips/res/values-lo/strings.xml
hips/res/values-mn/strings.xml
hips/res/values-ne/strings.xml
hips/res/values-si/strings.xml
hips/res/values-zh-rHK/strings.xml
|
| efb76c302fba3ac553ae07a0fd0e0d296ccbcf41 |
10-Aug-2013 |
Jay Shrauner <shrauner@google.com> |
am 6b425b5e: am 30d26326: Add directory photo support
* commit '6b425b5e4b7bb53a783ad3f07c78693a2cce551d':
|
| 6b425b5e4b7bb53a783ad3f07c78693a2cce551d |
10-Aug-2013 |
Jay Shrauner <shrauner@google.com> |
am 30d26326: Add directory photo support
* commit '30d26326568cb888430468370df6f6ab2ec12767':
Add directory photo support
|
| 3e6f65be3fabf89044182dab2d872ef58d076ee3 |
10-Aug-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
| 289d819c05337c49809ad275eca7206658d298b7 |
09-Aug-2013 |
Jay Shrauner <shrauner@google.com> |
am 30d26326: Add directory photo support
* commit '30d26326568cb888430468370df6f6ab2ec12767':
Add directory photo support
|
| 30d26326568cb888430468370df6f6ab2ec12767 |
08-Aug-2013 |
Jay Shrauner <shrauner@google.com> |
Add directory photo support
Load photos for directory thumbnail URIs by streaming directly from the URI.
Bug:7882158
Change-Id: Ifdf354c392b9aaff7c8fd6b73dc9bfe891825329
(cherry picked from commit 53d11c53b83bffe7607cffde994f505e775bcdbe)
hips/src/com/android/ex/chips/BaseRecipientAdapter.java
|
| 190ffbd0fbc116fa36e2b78bcf1f3f6a9f0188f0 |
09-Aug-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: I7a090f2436d7dbec310711f6c4a54aff0e7fc965
Auto-generated-cl: translation import
arousel/test/res/values-nb/strings.xml
|
| db7eabe04254528c048737a0b92966473ea2f319 |
06-Aug-2013 |
Scott Kennedy <skennedy@google.com> |
am bc742af5: Make Chips work on API 11+
* commit 'bc742af5bb568ed39dc37764587120928d068330':
Make Chips work on API 11+
|
| bc742af5bb568ed39dc37764587120928d068330 |
03-Aug-2013 |
Scott Kennedy <skennedy@google.com> |
Make Chips work on API 11+
By using the support library, and copying a few methods from TextView
into RecipientEditTextView, we can support chips back to API 11.
Bug: 8744878
Change-Id: I2d9bb43e71556504e929dcdccff9dae347020f28
hips/Android.mk
hips/AndroidManifest.xml
hips/src/com/android/ex/chips/BaseRecipientAdapter.java
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 4f8b198aeac24fbbc73fcb1fe644d520a7902939 |
01-Aug-2013 |
Scott Kennedy <skennedy@google.com> |
resolved conflicts for merge of b6c18ed6 to master
Change-Id: I7617af351d1fa7e4ce9ff401beffe21690b429d3
|
| b6c18ed611a22d01e901d05911392d7cff89f783 |
01-Aug-2013 |
Scott Kennedy <skennedy@google.com> |
Remove an unnecessary null check
Bug: 9497893
Change-Id: Ib363fc4b93a53c343e0e4cd4766038fee8324850
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 3fc2d99dabce30def058bb34f97eb0947a1c8f52 |
31-Jul-2013 |
Scott Kennedy <skennedy@google.com> |
am ad1d181c: Don\'t bother storing a null value in the cache
* commit 'ad1d181cd21ee598512c142150e79be754209548':
Don't bother storing a null value in the cache
|
| ad1d181cd21ee598512c142150e79be754209548 |
30-Jul-2013 |
Scott Kennedy <skennedy@google.com> |
Don't bother storing a null value in the cache
It serves very little purpose, and it causes an NPE.
Bug: 9286049
Change-Id: I8c95d8ded2bebdc9b904ef788cbc70865144213e
hips/src/com/android/ex/chips/BaseRecipientAdapter.java
|
| dc660babb68131f3fd9c62c1c1e640869d21bd92 |
14-Jul-2013 |
Alon Albert <aalbert@google.com> |
Support an External Dictionary of Contacts
Allow support for an external custom source of contacts. By making
some classes & methods protected rather than private, it's possible
to allow for a derived class to extend the Chips behavior to load
contacts from an arbitrary source.
Most of the changes here are just access modifier changes but there's
one more substantial change:
Intruduced BaseRecipientAdapter#getMatchingRecipients() which matches
generated recipients with proper chips recipients from the external
sources.
Ideally RecipientAlternatesAdapter#getMatchingRecipients() should reside
in the adaper too but the goal of this CL was to do this minimal
modifications.
There's also a small change that beileve was a bug in IndividualReplacementTask:
The matchesFound() callback gets a list of matches found. It then iterates all
the original recipients and looks for those that have matches and replaces them.
So far so good but, if the original recipient doesn't have a match and is not a
phone number, the old code still replaces it with itself when it can simply skip
it I think.
Change-Id: I24e89f93ec15154ed8912664cd061fa2b5b18bd8
hips/src/com/android/ex/chips/BaseRecipientAdapter.java
hips/src/com/android/ex/chips/RecipientAlternatesAdapter.java
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| aac694088bdbb11416d2ee1d1e9091cab272592f |
09-Jul-2013 |
Adam Metcalf <gamblore@google.com> |
Merge "Set the build dir to be relative to a root folder."
|
| 17d0542df0f2656d180d69f7170a0433d0bacba6 |
09-Jul-2013 |
Adam Metcalf <gamblore@google.com> |
Set the build dir to be relative to a root folder.
Change-Id: I61614f9cf0564ebf077c27bebfb02f4a06e00f64
ommon/build.gradle
|
| 59c8098c170047f906460cdd89f9f2ebba987960 |
01-Jul-2013 |
Andrew Sapperstein <asapperstein@google.com> |
am b5e00794: Fix some javadoc bugs.
* commit 'b5e0079419300f09253f160e0bdd28aa1bef4605':
Fix some javadoc bugs.
|
| b5e0079419300f09253f160e0bdd28aa1bef4605 |
01-Jul-2013 |
Andrew Sapperstein <asapperstein@google.com> |
Fix some javadoc bugs.
Change-Id: I10c04c3b69f68b44ff27bbbb1abcc2a0b60fd18a
ommon/java/com/android/common/OperationScheduler.java
|
| baca3253a2d4a3d9ec1b018a079c35d89dd1bdf2 |
20-Jun-2013 |
Paul Westbrook <pwestbro@google.com> |
Merge jb-ub-mail-ur10 into master
Change-Id: I37d9f0d0d2c8e72d59694c284d064070b615c60d
|
| c438c7b3b8a621c3aeccfeaa56f66935fdb1b177 |
19-Jun-2013 |
Scott Kennedy <skennedy@google.com> |
Prepare to remove a null check
I am fairly convinced that the fix for 9408464 will also fix the
underlying problem of this adapter being null.
If this log method is ever called, then I'll know it didn't work, but
I believe this will never be called.
Bug: 9497893
Change-Id: I08518ceecee6985462d0165fb16b1dea95181b07
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 634e2134080aa47637c4a3eb2372644202da1e90 |
14-Jun-2013 |
Adam Metcalf <gamblore@google.com> |
Gradle project file.
Adds a gradle project file so that other projects can use the
android-common library.
Change-Id: I02a2b7a50c7cbb101b360c083257d5acba21230a
ommon/AndroidManifest.xml
ommon/build.gradle
|
| 17d266469a185c44a705732310b8296393bc1668 |
07-Jun-2013 |
Scott Kennedy <skennedy@google.com> |
Fix a NPE
We may not get a cursor back from query(), and if that happens, we
shouldn't try to use the null cursor.
Bug: 9287151
Change-Id: Ie91d8003f51ea160e5b709a5cd6bcabefc3c687a
hips/src/com/android/ex/chips/RecipientAlternatesAdapter.java
|
| 53f35c7c31f31db40b106cc0f7a51f5daf40a7fd |
28-May-2013 |
Yorke Lee <yorkelee@google.com> |
Fix for CompositeCursorAdapter returning wrong item view types
Cherrypick of
https://googleplex-android-review.googlesource.com/#/c/306995/,
which fixes the bug that causes getItemViewType to be called
with the wrong position, causing new views to be created
unnecessarily.
Bug: 8398321
Change-Id: I6c921fe7d5135cf9f9d9bdd08b5aa4df7662ac1c
ommon/java/com/android/common/widget/CompositeCursorAdapter.java
|
| 1b1e52969c8efaf52632206d58a8302db5019064 |
21-May-2013 |
Ying Wang <wangying@google.com> |
Clean up dist files.
Change-Id: I32968b7d055e2d21252ae111826912bacb8faf1b
ommon/Android.mk
|
| 49b5931d0a905a9d2d5b42d14f88b617c3f89824 |
30-Apr-2013 |
Alice Yang <alice@google.com> |
am 2afceeee: am f881a056: Prevent NPE in chips
* commit '2afceeee0c79b3226ca4a98bcefa6275bd7fafe5':
|
| e6725f189c5c21cc5cb5a96c0b78980f3d30778d |
30-Apr-2013 |
Paul Westbrook <pwestbro@google.com> |
am 784638eb: am d259fd2d: Prevent IOOB exception
* commit '784638ebd2f86bd7f7cd27a5519fc3fdba81a2a8':
|
| 5acca6dfe30526e03c260ec0870785b19373d8e2 |
30-Apr-2013 |
Tom Taylor <tomtaylor@google.com> |
am 6838f553: am f823cf9a: am 49f52e22: Merge "Messaging crash on selecting a contact from the auto complete list in landscape mode" into jb-mr2-dev
* commit '6838f55343073a3697928ce8d91342f75d705352':
|
| 78898884ff207beddb4897154811c5931326240f |
30-Apr-2013 |
Scott Kennedy <skennedy@google.com> |
am 810cc386: am af7d2e85: am c9daed7a: Don\'t do chip resolving in place
* commit '810cc386944c3e90bc4e4f8328ec9cf8187803c7':
|
| 1410586291c933be8a9aa923d0344dbeabafd461 |
30-Apr-2013 |
Ying Wang <wangying@google.com> |
am b3ace932: am 15f7d4b3: am a3b03772: Add liblog
* commit 'b3ace9325f925bed124941e0ea12ae1b2b6d013a':
|
| 6055ae8a536669ace062e3bf93d898493a7666dd |
30-Apr-2013 |
Alice Yang <alice@google.com> |
am 8ed0b767: am 7eff765c: Merge remote-tracking branch \'goog/jb-mr2-dev\' into ur9
* commit '8ed0b767325296104e67a86671113f0329257cf1':
|
| 8a1f3ef028620e0020739b0bb2acd38e4933a459 |
30-Apr-2013 |
Daisuke Miyakawa <dmiyakawa@google.com> |
am 591d8350: am 6a3b8f9c: am 0d103b25: Add missing AOSP license
* commit '591d83500f0e922e46d457bcd1d49e63f32d4d0a':
|
| 1881c9e5ff580028a767046d2d9e1ed88d538b33 |
30-Apr-2013 |
The Android Open Source Project <initial-contribution@android.com> |
am d52bce37: am 2b26a46c: am de764172: am 4f14d40c: Reconcile with jb-release
* commit 'd52bce37c6c12d306671cd5d2599621de498131e':
|
| 9e2c3bd237f9108a60de0fc08cdd8843a4ea25f0 |
30-Apr-2013 |
Mindy Pereira <mindyp@google.com> |
am 3a90f1ed: am 1de84e96: am 9b18bf92: am ffb60406: am 87a5af3e: Break out of infinite loop once we detect an error.
* commit '3a90f1ed4ae6feed03f5a5a767540cfcb66423ce':
|
| 4e976013ef73aa2ecfa92a23458358a3565561ec |
30-Apr-2013 |
The Android Open Source Project <initial-contribution@android.com> |
am a90f03ea: am 587e9614: am cb7b9562: am e9792f85: Reconcile with jb-release
* commit 'a90f03ea073ec71c71fdd59ff08afe8724921d22':
|
| 36430ffedfdcddacc76884fe8bc6c69b05770c03 |
30-Apr-2013 |
Eric Fischer <enf@google.com> |
am 152d2acf: (-s ours) am 8448c8f6: am 4cdee7a6: (-s ours) am 90817b80: (-s ours) am 8c2158e5: Import translations. DO NOT MERGE
* commit '152d2acfd9b9254c725eaadf53ae148b44cf9397':
|
| 6af02ed8bcc07eacc4c9731b67ca364063e2c92c |
30-Apr-2013 |
Eric Fischer <enf@google.com> |
am a3d0f0c8: (-s ours) am d46cb0cd: am 85e9cc3b: (-s ours) Import translations. DO NOT MERGE
* commit 'a3d0f0c807f7d0d199567176c8b82afd7a22d387':
|
| e116f48f0f47a57c74d56cb08627ee303b009f32 |
30-Apr-2013 |
Mindy Pereira <mindyp@google.com> |
am 75a05836: am 73cbe0af: am 2d0d704a: am 567f6456: am d5c5e621: Merge "Rather than change the text, just remove the waiting for entries row." into jb-dev
* commit '75a0583687972a8757f2f8e499b6b933671df69c':
|
| 6a07c5cc7f7654943b5580cfe3d37d0b1b8f8b16 |
30-Apr-2013 |
Mindy Pereira <mindyp@google.com> |
am b5b7c2c5: am b1c730f2: am 7fb1843d: am 1c30f159: am 9c8e43d2: Merge "The mysterious blank item was just a mis-used layout" into jb-dev
* commit 'b5b7c2c5bd3d072cbcfc882ce80aab76b184247f':
|
| 6936b2c1a24f7f258bc338c1bc2a8caaf95b2365 |
30-Apr-2013 |
Mindy Pereira <mindyp@google.com> |
am f7fb34c9: am 50d4e942: am 74f9eae8: am 2797dbd5: am 3a36cf75: Merge "Dont hide the keyboard when showing alternates/ selecting a chip." into jb-dev
* commit 'f7fb34c9ec33fbcce350824eab996a5c802d81a7':
|
| ec4667aaedd12271c4c1c319f76bea0f43f46105 |
30-Apr-2013 |
Mindy Pereira <mindyp@google.com> |
am 524d242b: am 1e5b35d7: am df5c47c8: am eba508d0: am 932ec21b: Merge "Null check; back behavior" into jb-dev
* commit '524d242b9ee697c19d0aa31f5d3d2e60600881c5':
|
| 7e4c23fb5df5e6452e38c1224c7f7a85adcdc6a6 |
30-Apr-2013 |
The Android Open Source Project <initial-contribution@android.com> |
am 70a00586: am b69b416c: am 17876646: am 218ea026: Reconcile with jb-release
* commit '70a005864f6f9f82f1a0b6e7b3fcd5cec2e54fb5':
|
| e89988ad4ad52d05cc3e0f97e584145076eddb91 |
30-Apr-2013 |
Mindy Pereira <mindyp@google.com> |
am dc7db1a6: am f4d1f9fe: am 8dba5403: am 02840dc1: am 9c5e0403: Fix offset of alternates list dropdown.
* commit 'dc7db1a61c4f6510db68d8240b05da24a965e7e4':
|
| e0425463e227ff96fda866f2ce89d02fa9fdf799 |
30-Apr-2013 |
Mindy Pereira <mindyp@google.com> |
am 40fce5eb: am 31a7c911: am 8ae862b7: am 7178b0bc: am 291e619b: Try this out with experimenters to see if the scrolling is reasonable.
* commit '40fce5eb4a75369875a4af4a9a7614d443c818e9':
|
| 68940157190f44bc3df1dd7df58e126c505acbae |
30-Apr-2013 |
The Android Open Source Project <initial-contribution@android.com> |
am 23a361ed: am ff505df0: am f135d5f3: am 21a012ef: Reconcile with jb-release nakasi-factoryrom-release
* commit '23a361ed0d1defbbe5649192ce980f2931ae1235':
|
| 2e5fca0359481e3b96941031c4c4c5d1afa8d34b |
30-Apr-2013 |
Eric Fischer <enf@google.com> |
am 89da20f9: (-s ours) am 43db8085: am f351b6c0: (-s ours) am 54e55fee: (-s ours) am 9ec75cef: Import translations. DO NOT MERGE
* commit '89da20f91684cd29065935675dde199e110a0509':
|
| 266ad7d2d20f3327de80eb8a2888772dc9f6ed86 |
30-Apr-2013 |
Eric Fischer <enf@google.com> |
am 902fd54c: (-s ours) am 741a8156: am 1fe84a2d: (-s ours) Import translations. DO NOT MERGE
* commit '902fd54c217312565337dbc735842f60389801ee':
|
| de48db62fbe50523ee9cb5e5e3bcaafb40a3cebb |
30-Apr-2013 |
The Android Open Source Project <initial-contribution@android.com> |
am 2bb2bd56: am 3dc96b3e: am d444e484: am 9d3bd0a0: Reconcile with jb-release nakasi-factoryrom-release
* commit '2bb2bd56a0e5725c7070ed8061aa5ab2c9027f79':
|
| 65a29f5f7664eb6bf39ae066643616e5a2ad238d |
30-Apr-2013 |
Eric Fischer <enf@google.com> |
am 94cf3126: (-s ours) am 47e22196: am 146ea842: (-s ours) am b775f325: (-s ours) Import translations. DO NOT MERGE
* commit '94cf31268c20c2613592a79c51a4a0232fb8a970':
|
| 630ca22865d64fe67d29987a55456085badbc9e2 |
30-Apr-2013 |
Eric Fischer <enf@google.com> |
am 12f7f484: (-s ours) am 85eee52a: am 257de1d9: (-s ours) Import translations. DO NOT MERGE
* commit '12f7f48460f5ee9f574379fcc09642e9895b912a':
|
| 4f7d1537580fa772de0ef354c1fd4ce1f3b19436 |
30-Apr-2013 |
Eric Fischer <enf@google.com> |
am 79cda583: (-s ours) am f2545189: am 22d63c44: (-s ours) am 8b62d386: (-s ours) Import translations. DO NOT MERGE
* commit '79cda5830e69e6e6ceb0823548df1a5c9d9627a2':
|
| 24232e695562c21dc96252851666460824771273 |
30-Apr-2013 |
Eric Fischer <enf@google.com> |
am 518ea705: (-s ours) am 3164190b: am 20a3b8c7: (-s ours) Import translations. DO NOT MERGE
* commit '518ea7056895a68fa82a8074443f8db734180865':
|
| 788ef978f953a176b98d916513125738335d1a71 |
30-Apr-2013 |
Eric Fischer <enf@google.com> |
am 3bd1ed37: (-s ours) am 8b56f108: am ce538a42: (-s ours) am ff7300c8: (-s ours) Import translations. DO NOT MERGE
* commit '3bd1ed378f514315c5dcd921652bcc657f119794':
|
| 53a3355c8e425a62d7b8100857acc6c4968f2572 |
30-Apr-2013 |
Eric Fischer <enf@google.com> |
am 25e9aded: (-s ours) am a525a0d7: am f9c54fb1: (-s ours) Import translations. DO NOT MERGE
* commit '25e9adedcbacbba342f385670d8b83ff88b3a9b6':
|
| 799d76de1720baa62a9d770f2a7009532b2412f9 |
30-Apr-2013 |
Eric Fischer <enf@google.com> |
am 204d2ac2: (-s ours) am 0f49d40e: (-s ours) am 9922002f: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '204d2ac2cab627d920563e4876e053910fb1d7ff':
|
| 05d569377c44c05e647ec63860ab8d122c65f783 |
30-Apr-2013 |
Eric Fischer <enf@google.com> |
am fce2945d: (-s ours) am d7dcc2e7: (-s ours) am 83f4d736: (-s ours) am 564269bf: (-s ours) Import translations. DO NOT MERGE
* commit 'fce2945d96ef111bf1c36035e7cc51e1d295c0fc':
|
| 933d3e1ec7389aa3f29f6e4c986382e9f40a306f |
30-Apr-2013 |
Alice Yang <alice@google.com> |
am b3eb330e: am 7e3f1546: am 2e0ba2ec: Merge "Move StaggeredGridView into ex from v4 support library"
* commit 'b3eb330eadd639ab92b4c5d1c26c601ded378130':
|
| 7848a5ea96c6ad745cedf5ac8226fec2dff12821 |
30-Apr-2013 |
Mindy Pereira <mindyp@google.com> |
am 89b47ea6: am 0ac1c774: am f30ffd13: am 1896ac00: Change text on "done" to say "return"
* commit '89b47ea66f60439704a9845e083fdd37bcf8960e':
|
| 03a51c70374446c7d4f70a62002b19e0b57796ca |
30-Apr-2013 |
Mindy Pereira <mindyp@google.com> |
am 72fd8ab7: am 327b11ab: am 7e12aaa7: am dd5c5cf8: Use ALIGN_BOTTOM instead of ALIGN_BASELINE
* commit '72fd8ab726fc3b2c459027fa2507bcd6732363f0':
|
| 5b9869a4f061ead97b49ddeecea476619d3ee922 |
30-Apr-2013 |
Tom Taylor <tomtaylor@google.com> |
am 919812c6: am 0719fbb2: am 32bfa893: am ab2c5069: Contact added to the "To" field of the Messaging app is not getting deleted
* commit '919812c66cab27d69ea780d8f55e55357bb737f1':
|
| 1672c52489108a374c89fbe449631e795e11ad7f |
30-Apr-2013 |
Tom Taylor <tomtaylor@google.com> |
am e0510878: am 4ebfe2d3: am b7719c17: am 5ba77015: Merge "Don\'t autoselect first item in dropdown" into jb-dev
* commit 'e05108789e90ec1e030f7fc04cb89f1e13edcf8e':
|
| 12845e0bd49a2d64c9bf3d001c63b1088bf40409 |
30-Apr-2013 |
Mindy Pereira <mindyp@google.com> |
am 709c4e08: am a4f33daf: am 525ec743: am 593f0b4e: Fix alternate reverse lookup query.
* commit '709c4e08522ac9108a0c7779b82896661d054171':
|
| f2e0468c1ec90921042654b5dcf295c4f40f636e |
30-Apr-2013 |
Makoto Onuki <omakoto@google.com> |
am 45210f0c: am 81dc10b4: am 8f1f5423: am f64cbf19: Don\'t show duplicate destinations in alternate popup
* commit '45210f0c0bd4d1a1526a62435f011dfde25b67d3':
|
| a68450d24b91a5a9c6fee466bbbcc20c240c14dc |
30-Apr-2013 |
Eric Fischer <enf@google.com> |
am d07c572a: (-s ours) am 06e1da6c: am 79361f84: (-s ours) am a97c5fbb: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-dev
* commit 'd07c572a4e2b75bd27787020c31dcfe687245676':
|
| 1754ae833b5ba57dafbf3b4970abb553191afe55 |
30-Apr-2013 |
Eric Fischer <enf@google.com> |
am f2eece87: (-s ours) am e0502615: am 680a9d72: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit 'f2eece8791cfe8851040152d027c105263482cfd':
|
| 2afceeee0c79b3226ca4a98bcefa6275bd7fafe5 |
30-Apr-2013 |
Alice Yang <alice@google.com> |
am f881a056: Prevent NPE in chips
* commit 'f881a0565252fe947775d499768ef6a46490348a':
Prevent NPE in chips
|
| 784638ebd2f86bd7f7cd27a5519fc3fdba81a2a8 |
30-Apr-2013 |
Paul Westbrook <pwestbro@google.com> |
am d259fd2d: Prevent IOOB exception
* commit 'd259fd2d897c741fa5ca1067a4596beeb2e0a938':
Prevent IOOB exception
|
| 6838f55343073a3697928ce8d91342f75d705352 |
30-Apr-2013 |
Tom Taylor <tomtaylor@google.com> |
am f823cf9a: am 49f52e22: Merge "Messaging crash on selecting a contact from the auto complete list in landscape mode" into jb-mr2-dev
* commit 'f823cf9a25b9010dbe3cb79ee188d6affec0e596':
|
| 810cc386944c3e90bc4e4f8328ec9cf8187803c7 |
30-Apr-2013 |
Scott Kennedy <skennedy@google.com> |
am af7d2e85: am c9daed7a: Don\'t do chip resolving in place
* commit 'af7d2e85c72bebea248efd084f7f469206259d39':
|
| b3ace9325f925bed124941e0ea12ae1b2b6d013a |
30-Apr-2013 |
Ying Wang <wangying@google.com> |
am 15f7d4b3: am a3b03772: Add liblog
* commit '15f7d4b327855c684d1ec11f48331642e8dcada1':
|
| 8ed0b767325296104e67a86671113f0329257cf1 |
30-Apr-2013 |
Alice Yang <alice@google.com> |
am 7eff765c: Merge remote-tracking branch \'goog/jb-mr2-dev\' into ur9
* commit '7eff765ccc83a41c8bd7207b0cc0c5227eae9dc5':
|
| 591d83500f0e922e46d457bcd1d49e63f32d4d0a |
30-Apr-2013 |
Daisuke Miyakawa <dmiyakawa@google.com> |
am 6a3b8f9c: am 0d103b25: Add missing AOSP license
* commit '6a3b8f9c323583ed2243afb3f6d6290d68419755':
|
| d52bce37c6c12d306671cd5d2599621de498131e |
30-Apr-2013 |
The Android Open Source Project <initial-contribution@android.com> |
am 2b26a46c: am de764172: am 4f14d40c: Reconcile with jb-release
* commit '2b26a46c20388b2b6c889477b3d40fc8170a5e7d':
|
| 3a90f1ed4ae6feed03f5a5a767540cfcb66423ce |
30-Apr-2013 |
Mindy Pereira <mindyp@google.com> |
am 1de84e96: am 9b18bf92: am ffb60406: am 87a5af3e: Break out of infinite loop once we detect an error.
* commit '1de84e96dece45e2d7793e7111a509ef1f9879f6':
|
| a90f03ea073ec71c71fdd59ff08afe8724921d22 |
30-Apr-2013 |
The Android Open Source Project <initial-contribution@android.com> |
am 587e9614: am cb7b9562: am e9792f85: Reconcile with jb-release
* commit '587e96145643ba7570730080aa4fe8865df3712a':
|
| 152d2acfd9b9254c725eaadf53ae148b44cf9397 |
30-Apr-2013 |
Eric Fischer <enf@google.com> |
am 8448c8f6: am 4cdee7a6: (-s ours) am 90817b80: (-s ours) am 8c2158e5: Import translations. DO NOT MERGE
* commit '8448c8f65b6f12c9e20e264cf124f8a398cf0b80':
|
| a3d0f0c807f7d0d199567176c8b82afd7a22d387 |
30-Apr-2013 |
Eric Fischer <enf@google.com> |
am d46cb0cd: am 85e9cc3b: (-s ours) Import translations. DO NOT MERGE
* commit 'd46cb0cd3ca94a1aad70d63b21b13ae8a7b616c2':
|
| 75a0583687972a8757f2f8e499b6b933671df69c |
30-Apr-2013 |
Mindy Pereira <mindyp@google.com> |
am 73cbe0af: am 2d0d704a: am 567f6456: am d5c5e621: Merge "Rather than change the text, just remove the waiting for entries row." into jb-dev
* commit '73cbe0af0a5a2d46a02db9a68ab0b893cd3294f5':
|
| b5b7c2c5bd3d072cbcfc882ce80aab76b184247f |
30-Apr-2013 |
Mindy Pereira <mindyp@google.com> |
am b1c730f2: am 7fb1843d: am 1c30f159: am 9c8e43d2: Merge "The mysterious blank item was just a mis-used layout" into jb-dev
* commit 'b1c730f2b3e41cc7a6718db654b28ca8cc7fc86b':
|
| f7fb34c9ec33fbcce350824eab996a5c802d81a7 |
30-Apr-2013 |
Mindy Pereira <mindyp@google.com> |
am 50d4e942: am 74f9eae8: am 2797dbd5: am 3a36cf75: Merge "Dont hide the keyboard when showing alternates/ selecting a chip." into jb-dev
* commit '50d4e942ff4744a164afa2b4cba3c19cb6fc0c92':
|
| 524d242b9ee697c19d0aa31f5d3d2e60600881c5 |
30-Apr-2013 |
Mindy Pereira <mindyp@google.com> |
am 1e5b35d7: am df5c47c8: am eba508d0: am 932ec21b: Merge "Null check; back behavior" into jb-dev
* commit '1e5b35d7974a22ab0168cc68281d55ea58eb783c':
|
| 70a005864f6f9f82f1a0b6e7b3fcd5cec2e54fb5 |
30-Apr-2013 |
The Android Open Source Project <initial-contribution@android.com> |
am b69b416c: am 17876646: am 218ea026: Reconcile with jb-release
* commit 'b69b416cc2dfefc7eec5105d3e8bfa0bc58cd92b':
|
| dc7db1a61c4f6510db68d8240b05da24a965e7e4 |
30-Apr-2013 |
Mindy Pereira <mindyp@google.com> |
am f4d1f9fe: am 8dba5403: am 02840dc1: am 9c5e0403: Fix offset of alternates list dropdown.
* commit 'f4d1f9fe49bcc022def1143d49e8911ba54d4828':
|
| 40fce5eb4a75369875a4af4a9a7614d443c818e9 |
30-Apr-2013 |
Mindy Pereira <mindyp@google.com> |
am 31a7c911: am 8ae862b7: am 7178b0bc: am 291e619b: Try this out with experimenters to see if the scrolling is reasonable.
* commit '31a7c9112687dd6eae490cfb6a1791069cbd648b':
|
| 23a361ed0d1defbbe5649192ce980f2931ae1235 |
30-Apr-2013 |
The Android Open Source Project <initial-contribution@android.com> |
am ff505df0: am f135d5f3: am 21a012ef: Reconcile with jb-release nakasi-factoryrom-release
* commit 'ff505df024175819857c25f10249cf0abe3d1518':
|
| 89da20f91684cd29065935675dde199e110a0509 |
30-Apr-2013 |
Eric Fischer <enf@google.com> |
am 43db8085: am f351b6c0: (-s ours) am 54e55fee: (-s ours) am 9ec75cef: Import translations. DO NOT MERGE
* commit '43db808500c47eee307815729601def90715c2b0':
|
| 902fd54c217312565337dbc735842f60389801ee |
30-Apr-2013 |
Eric Fischer <enf@google.com> |
am 741a8156: am 1fe84a2d: (-s ours) Import translations. DO NOT MERGE
* commit '741a81560030f90eddd2fa56b4cb1f7b35bd0a9f':
|
| 2bb2bd56a0e5725c7070ed8061aa5ab2c9027f79 |
30-Apr-2013 |
The Android Open Source Project <initial-contribution@android.com> |
am 3dc96b3e: am d444e484: am 9d3bd0a0: Reconcile with jb-release nakasi-factoryrom-release
* commit '3dc96b3e5f59a539fdd1910478c409f53a1fe42f':
|
| 94cf31268c20c2613592a79c51a4a0232fb8a970 |
30-Apr-2013 |
Eric Fischer <enf@google.com> |
am 47e22196: am 146ea842: (-s ours) am b775f325: (-s ours) Import translations. DO NOT MERGE
* commit '47e2219694002b4d5f5210410d0bc460bee1adef':
|
| 12f7f48460f5ee9f574379fcc09642e9895b912a |
30-Apr-2013 |
Eric Fischer <enf@google.com> |
am 85eee52a: am 257de1d9: (-s ours) Import translations. DO NOT MERGE
* commit '85eee52a76b68f698c3b739907b6aada4fb7cee3':
|
| 79cda5830e69e6e6ceb0823548df1a5c9d9627a2 |
30-Apr-2013 |
Eric Fischer <enf@google.com> |
am f2545189: am 22d63c44: (-s ours) am 8b62d386: (-s ours) Import translations. DO NOT MERGE
* commit 'f254518958cde4cc84a7ee9a1f6923959cbf8b55':
|
| 518ea7056895a68fa82a8074443f8db734180865 |
30-Apr-2013 |
Eric Fischer <enf@google.com> |
am 3164190b: am 20a3b8c7: (-s ours) Import translations. DO NOT MERGE
* commit '3164190be01d1ae8fdfcaa836c3d14f6d19fd1f9':
|
| 3bd1ed378f514315c5dcd921652bcc657f119794 |
30-Apr-2013 |
Eric Fischer <enf@google.com> |
am 8b56f108: am ce538a42: (-s ours) am ff7300c8: (-s ours) Import translations. DO NOT MERGE
* commit '8b56f108f373fc17ae43aab775c426c147ef3bc8':
|
| 25e9adedcbacbba342f385670d8b83ff88b3a9b6 |
30-Apr-2013 |
Eric Fischer <enf@google.com> |
am a525a0d7: am f9c54fb1: (-s ours) Import translations. DO NOT MERGE
* commit 'a525a0d75d9577cf3418fd7b89eecc54593eadbf':
|
| 204d2ac2cab627d920563e4876e053910fb1d7ff |
30-Apr-2013 |
Eric Fischer <enf@google.com> |
am 0f49d40e: (-s ours) am 9922002f: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '0f49d40eb9fbc8c4fe3515b23784dd521d8d4a8d':
|
| fce2945d96ef111bf1c36035e7cc51e1d295c0fc |
30-Apr-2013 |
Eric Fischer <enf@google.com> |
am d7dcc2e7: (-s ours) am 83f4d736: (-s ours) am 564269bf: (-s ours) Import translations. DO NOT MERGE
* commit 'd7dcc2e787371ebcc34672fbe3828b32857e5825':
|
| b3eb330eadd639ab92b4c5d1c26c601ded378130 |
30-Apr-2013 |
Alice Yang <alice@google.com> |
am 7e3f1546: am 2e0ba2ec: Merge "Move StaggeredGridView into ex from v4 support library"
* commit '7e3f1546a29667ce7a33ae06858331b01d5afd4c':
|
| 89b47ea66f60439704a9845e083fdd37bcf8960e |
30-Apr-2013 |
Mindy Pereira <mindyp@google.com> |
am 0ac1c774: am f30ffd13: am 1896ac00: Change text on "done" to say "return"
* commit '0ac1c7749b1d67667da77381c24c0d78ffc26855':
|
| 72fd8ab726fc3b2c459027fa2507bcd6732363f0 |
30-Apr-2013 |
Mindy Pereira <mindyp@google.com> |
am 327b11ab: am 7e12aaa7: am dd5c5cf8: Use ALIGN_BOTTOM instead of ALIGN_BASELINE
* commit '327b11abdb95a185b0e39d48a9a315a615d962a1':
|
| 919812c66cab27d69ea780d8f55e55357bb737f1 |
30-Apr-2013 |
Tom Taylor <tomtaylor@google.com> |
am 0719fbb2: am 32bfa893: am ab2c5069: Contact added to the "To" field of the Messaging app is not getting deleted
* commit '0719fbb2cbf56bf9a219be6e2e47ed29bde35186':
|
| e05108789e90ec1e030f7fc04cb89f1e13edcf8e |
30-Apr-2013 |
Tom Taylor <tomtaylor@google.com> |
am 4ebfe2d3: am b7719c17: am 5ba77015: Merge "Don\'t autoselect first item in dropdown" into jb-dev
* commit '4ebfe2d3c0f930878ee5c7823316c58f8b5a2620':
|
| 709c4e08522ac9108a0c7779b82896661d054171 |
30-Apr-2013 |
Mindy Pereira <mindyp@google.com> |
am a4f33daf: am 525ec743: am 593f0b4e: Fix alternate reverse lookup query.
* commit 'a4f33dafe61e89c5753758f36d237f60d126343c':
|
| 45210f0c0bd4d1a1526a62435f011dfde25b67d3 |
30-Apr-2013 |
Makoto Onuki <omakoto@google.com> |
am 81dc10b4: am 8f1f5423: am f64cbf19: Don\'t show duplicate destinations in alternate popup
* commit '81dc10b475b53aae8040da532dd1b667cbc3e06f':
|
| d07c572a4e2b75bd27787020c31dcfe687245676 |
30-Apr-2013 |
Eric Fischer <enf@google.com> |
am 06e1da6c: am 79361f84: (-s ours) am a97c5fbb: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '06e1da6cb8e53c0c4dc9267bdbaba3ea9c0d7c32':
|
| f2eece8791cfe8851040152d027c105263482cfd |
30-Apr-2013 |
Eric Fischer <enf@google.com> |
am e0502615: am 680a9d72: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit 'e050261533ed4fff1c86a0553a5858e22d0305a9':
|
| e91d9ea7c7013c42bb6f38ebe3832725e063ec52 |
26-Apr-2013 |
Alice Yang <alice@google.com> |
am 31b46a1c: am f881a056: Prevent NPE in chips
* commit '31b46a1c8d707ca384c044e3e996ced2a2e52dd4':
Prevent NPE in chips
|
| 31b46a1c8d707ca384c044e3e996ced2a2e52dd4 |
26-Apr-2013 |
Alice Yang <alice@google.com> |
am f881a056: Prevent NPE in chips
* commit 'f881a0565252fe947775d499768ef6a46490348a':
Prevent NPE in chips
|
| f881a0565252fe947775d499768ef6a46490348a |
26-Apr-2013 |
Alice Yang <alice@google.com> |
Prevent NPE in chips
Bug 8733626
Change-Id: Id74ed7de4f16f9a7e716b4e9f2152dded97a91e9
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 2d3f2bcfdcd4593edd23b17868289d5a5c2f34da |
24-Apr-2013 |
Paul Westbrook <pwestbro@google.com> |
Merge jb-ub-mail-ur10' into master
Change-Id: I9717293c60c311834c7c643cd27cee06149ec07a
|
| 305bea9dc5f0fc8a3cdd1390c03178ff55e4d324 |
24-Apr-2013 |
Tom Taylor <tomtaylor@google.com> |
am 38fad850: am f823cf9a: am 49f52e22: Merge "Messaging crash on selecting a contact from the auto complete list in landscape mode" into jb-mr2-dev
* commit '38fad8504757ab7d38c9083fb13f866f7435d469':
|
| 18284ed4a9e960cad2be1f87ae01b27ca28f1408 |
24-Apr-2013 |
Scott Kennedy <skennedy@google.com> |
am 1aa94276: am af7d2e85: am c9daed7a: Don\'t do chip resolving in place
* commit '1aa942760c88925e63c40c2aa2b5aa2c1d37b392':
|
| 05326701e44ed29a4edef27e5ee011db32cbe796 |
24-Apr-2013 |
Ying Wang <wangying@google.com> |
am f3a6b6ab: am 15f7d4b3: am a3b03772: Add liblog
* commit 'f3a6b6abbbd4c5df615b60ec1a7e89738fe136ff':
|
| 6113f7e879f5270b3910cf075317f7ea4449d18b |
24-Apr-2013 |
Alice Yang <alice@google.com> |
am 56997c44: am 7eff765c: Merge remote-tracking branch \'goog/jb-mr2-dev\' into ur9
* commit '56997c441fb2515642d8c10f934e55a17e9a3105':
|
| 2d1e5b5d1b05438e4d9690d483649efb241a5b4e |
23-Apr-2013 |
Daisuke Miyakawa <dmiyakawa@google.com> |
am 98a6e9ac: am 6a3b8f9c: am 0d103b25: Add missing AOSP license
* commit '98a6e9acd54b53f6fdc6a9fe3c7a894b67b6bec2':
|
| 35d917eaa4d4799cf9a83ba1d43a66ef0eb8e0be |
23-Apr-2013 |
The Android Open Source Project <initial-contribution@android.com> |
am cb22f223: am 2b26a46c: am de764172: am 4f14d40c: Reconcile with jb-release
* commit 'cb22f223b92de230711f34b086e8337e0fb791a1':
|
| dd8b53b512b36121eadce8b78e2f9a367002fb1f |
23-Apr-2013 |
Mindy Pereira <mindyp@google.com> |
am 00ad5cae: am 1de84e96: am 9b18bf92: am ffb60406: am 87a5af3e: Break out of infinite loop once we detect an error.
* commit '00ad5cae061bd5eaf1e5f6b77d73a125049ba1f1':
|
| 07966725a55fc84dd829b5f5edb9f6c39b1d0f57 |
23-Apr-2013 |
The Android Open Source Project <initial-contribution@android.com> |
am 78d50ea7: am 587e9614: am cb7b9562: am e9792f85: Reconcile with jb-release
* commit '78d50ea7133bf68784aed92e382d897c04fa7f15':
|
| 04335be854380a7cf738af7c551fcb0046c0e8aa |
23-Apr-2013 |
Eric Fischer <enf@google.com> |
am 91500071: (-s ours) am 8448c8f6: (-s ours) am 4cdee7a6: (-s ours) am 90817b80: (-s ours) am 8c2158e5: Import translations. DO NOT MERGE
* commit '9150007107cb8b53ced0cc85d2c6054976e4ace8':
|
| c01addd9f2093048775bceddad4c51317555ea8b |
23-Apr-2013 |
Eric Fischer <enf@google.com> |
am f5051373: (-s ours) am d46cb0cd: (-s ours) am 85e9cc3b: (-s ours) Import translations. DO NOT MERGE
* commit 'f50513737df3fa5c3b59f80cbc72ad27ab4b2b78':
|
| e266faf94fedfd0c204bc53fcd01f13f7e2aa0e5 |
23-Apr-2013 |
Mindy Pereira <mindyp@google.com> |
am 14c87891: am 73cbe0af: am 2d0d704a: am 567f6456: am d5c5e621: Merge "Rather than change the text, just remove the waiting for entries row." into jb-dev
* commit '14c87891065f67eaf3437d1d9658c8ca52490c9a':
|
| 73c829621c563232eacf7c11404802c8b778e96a |
23-Apr-2013 |
Mindy Pereira <mindyp@google.com> |
am 03a83de2: am b1c730f2: am 7fb1843d: am 1c30f159: am 9c8e43d2: Merge "The mysterious blank item was just a mis-used layout" into jb-dev
* commit '03a83de2b24e262807bce27ebd538fddadb8d41b':
|
| a626a4d97397cb0ea129426f0444ae91961e6915 |
23-Apr-2013 |
Mindy Pereira <mindyp@google.com> |
am 0237d1c9: am 50d4e942: am 74f9eae8: am 2797dbd5: am 3a36cf75: Merge "Dont hide the keyboard when showing alternates/ selecting a chip." into jb-dev
* commit '0237d1c966fec4ba0f48debde8606cdb1f48ee7f':
|
| a2cf2a836876e24a33c3cef5d495f1da512a11be |
23-Apr-2013 |
Mindy Pereira <mindyp@google.com> |
am 49378d8e: am 1e5b35d7: am df5c47c8: am eba508d0: am 932ec21b: Merge "Null check; back behavior" into jb-dev
* commit '49378d8e3ee17e2856c796be64fba7e604961bf2':
|
| e817430bcae96afdef6bfac8d9aeb96269ea1c05 |
23-Apr-2013 |
The Android Open Source Project <initial-contribution@android.com> |
am a8c57e11: am b69b416c: am 17876646: am 218ea026: Reconcile with jb-release
* commit 'a8c57e1172dd6a7184d7c2883879730e48654318':
|
| db62a1e0d5fb4d22a2c075db6df7c47a5f7b0433 |
23-Apr-2013 |
Mindy Pereira <mindyp@google.com> |
am 908a4a97: am f4d1f9fe: am 8dba5403: am 02840dc1: am 9c5e0403: Fix offset of alternates list dropdown.
* commit '908a4a972698f611fbeafe18e9d6e52f0ef953f0':
|
| 545de0ae12d352ca0605b13b867cf187a97ccd1e |
23-Apr-2013 |
Mindy Pereira <mindyp@google.com> |
am d0291606: am 31a7c911: am 8ae862b7: am 7178b0bc: am 291e619b: Try this out with experimenters to see if the scrolling is reasonable.
* commit 'd0291606ad50d4340b540bda0bcb381500bfbb76':
|
| 75a680fe2c8c3d86f82e8045308a24e853f185c4 |
23-Apr-2013 |
The Android Open Source Project <initial-contribution@android.com> |
am 463d753d: am ff505df0: am f135d5f3: am 21a012ef: Reconcile with jb-release nakasi-factoryrom-release
* commit '463d753d375e2339554d4e8eebd6074a17a5a102':
|
| f38235f613ff905bc86ffd8a8cf849a13208a2b7 |
23-Apr-2013 |
Eric Fischer <enf@google.com> |
am 76f57229: (-s ours) am 43db8085: (-s ours) am f351b6c0: (-s ours) am 54e55fee: (-s ours) am 9ec75cef: Import translations. DO NOT MERGE
* commit '76f5722937cca51cfbb95aa626fda7bfaa91b8fd':
|
| 303822ec3c21974fa8f1c87506089d95cfffcebc |
23-Apr-2013 |
Eric Fischer <enf@google.com> |
am 26e2e312: (-s ours) am 741a8156: (-s ours) am 1fe84a2d: (-s ours) Import translations. DO NOT MERGE
* commit '26e2e3128dc0e71f448c22a187503f2f5b4ea8a1':
|
| 948f11af8eb1ea71be32c590e1e241a4edfb850d |
23-Apr-2013 |
The Android Open Source Project <initial-contribution@android.com> |
am 7c075daf: am 3dc96b3e: am d444e484: am 9d3bd0a0: Reconcile with jb-release nakasi-factoryrom-release
* commit '7c075daf5e940c29490e0ca014f01db4773d9ee5':
|
| 2e1b1c28a6365971b424bb650b42ffa255bb42a1 |
23-Apr-2013 |
Eric Fischer <enf@google.com> |
am ce342c43: (-s ours) am 47e22196: (-s ours) am 146ea842: (-s ours) am b775f325: (-s ours) Import translations. DO NOT MERGE
* commit 'ce342c43a90dae12ba3f1444eb643e5b6bf59ce7':
|
| 3ec81549012b8931e67949fbea522f0b6fe9c06a |
23-Apr-2013 |
Eric Fischer <enf@google.com> |
am 81a05f01: (-s ours) am 85eee52a: (-s ours) am 257de1d9: (-s ours) Import translations. DO NOT MERGE
* commit '81a05f0157eb586c0bec1e7e9f1fd6b319c1b41e':
|
| 0769d6a48370b093e8731bbfb46776729090f140 |
23-Apr-2013 |
Eric Fischer <enf@google.com> |
am 475750c3: (-s ours) am f2545189: (-s ours) am 22d63c44: (-s ours) am 8b62d386: (-s ours) Import translations. DO NOT MERGE
* commit '475750c3c2a5c4bc577b7fa04a8f245cc47310ea':
|
| ac9cc6df6abfe2d089c1b7292a10d697f1b87782 |
23-Apr-2013 |
Eric Fischer <enf@google.com> |
am f6fa3e64: (-s ours) am 3164190b: (-s ours) am 20a3b8c7: (-s ours) Import translations. DO NOT MERGE
* commit 'f6fa3e64520e334a7fd4a48fe9f2081cefed6c73':
|
| 9d6bed839fd87101eadc1f1a3f11f14deb67b62c |
23-Apr-2013 |
Eric Fischer <enf@google.com> |
am bfc6d1ec: (-s ours) am 8b56f108: (-s ours) am ce538a42: (-s ours) am ff7300c8: (-s ours) Import translations. DO NOT MERGE
* commit 'bfc6d1ec88d0cf8de308380b3209a09b25deb98b':
|
| d87dd73bfd573719bb6555e4db90749f54ed4d8e |
23-Apr-2013 |
Eric Fischer <enf@google.com> |
am 829c1e17: (-s ours) am a525a0d7: (-s ours) am f9c54fb1: (-s ours) Import translations. DO NOT MERGE
* commit '829c1e17ce0d5c4966d614e5edd933fda94669b6':
|
| a6d511198f973f35f5cb6f753bb90322bfeaf7c8 |
23-Apr-2013 |
Eric Fischer <enf@google.com> |
am 6cfb3f93: (-s ours) am 0f49d40e: (-s ours) am 9922002f: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '6cfb3f9379c3d4e16255d5a3b95a07a50988d319':
|
| 0e73116f73b61800c752f9965c855e89e1a60281 |
23-Apr-2013 |
Eric Fischer <enf@google.com> |
am 2dc9ccf2: (-s ours) am d7dcc2e7: (-s ours) am 83f4d736: (-s ours) am 564269bf: (-s ours) Import translations. DO NOT MERGE
* commit '2dc9ccf2ba21dd65a4f9b946ef929667528a8114':
|
| 579f53ed49a650692f668351b01b02adfc44588f |
23-Apr-2013 |
Alice Yang <alice@google.com> |
am 44298b34: am 7e3f1546: am 2e0ba2ec: Merge "Move StaggeredGridView into ex from v4 support library"
* commit '44298b34f6e42cf30ed0af9a7755f9c2f20e18fe':
|
| f579b3f1bb9a6279b577c71e005e35be5d450133 |
23-Apr-2013 |
Mindy Pereira <mindyp@google.com> |
am 85e08acf: am 0ac1c774: am f30ffd13: am 1896ac00: Change text on "done" to say "return"
* commit '85e08acfc4cc80e40f988229b485a905b8ec9e2a':
|
| 1c1e903ac940817e260ba18c0010fc53b36dbf72 |
23-Apr-2013 |
Mindy Pereira <mindyp@google.com> |
am 5d3280a2: am 327b11ab: am 7e12aaa7: am dd5c5cf8: Use ALIGN_BOTTOM instead of ALIGN_BASELINE
* commit '5d3280a2d6efd87a2f6524f198f6689fa1c200f6':
|
| ebe31b9a350be80ffd20f09518b43a1469ded963 |
23-Apr-2013 |
Tom Taylor <tomtaylor@google.com> |
am 47277774: am 0719fbb2: am 32bfa893: am ab2c5069: Contact added to the "To" field of the Messaging app is not getting deleted
* commit '472777746bc99833edfda1480167982f37bb8643':
|
| 391c69ba2e08ea124e43f505aa4c26cb3363e516 |
23-Apr-2013 |
Tom Taylor <tomtaylor@google.com> |
am 2b5a4a55: am 4ebfe2d3: am b7719c17: am 5ba77015: Merge "Don\'t autoselect first item in dropdown" into jb-dev
* commit '2b5a4a55d94ba620433c0465f18d2d0e82973ae1':
|
| f2ad087c755e934bbb9d927aad8807b03b2073af |
23-Apr-2013 |
Mindy Pereira <mindyp@google.com> |
am 73e01f77: am a4f33daf: am 525ec743: am 593f0b4e: Fix alternate reverse lookup query.
* commit '73e01f77c30da29be25ecf5ff7fb8e99c0028383':
|
| c16ec241dd1f05bb1f5cb01b426f08358cbf44eb |
23-Apr-2013 |
Makoto Onuki <omakoto@google.com> |
am b4d8f076: am 81dc10b4: am 8f1f5423: am f64cbf19: Don\'t show duplicate destinations in alternate popup
* commit 'b4d8f076dfa4f2192bd8f6f24ea396c505a7f4bf':
|
| f277f638489cf9cdef708c847f495d1e44a1858b |
23-Apr-2013 |
Eric Fischer <enf@google.com> |
am 6336d308: (-s ours) am 06e1da6c: (-s ours) am 79361f84: (-s ours) am a97c5fbb: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '6336d3087c03a2d7997e5493a36bad9d34751fa9':
|
| 30af5c84762da5f860d9ef94ba8712c5f647246f |
23-Apr-2013 |
Eric Fischer <enf@google.com> |
am 8586f490: (-s ours) am e0502615: (-s ours) am 680a9d72: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '8586f490afd8b1cc66e854a24b7771ab9c762283':
|
| 0a3140bf243b406da59e74a32fec6929a94de24e |
22-Apr-2013 |
Paul Westbrook <pwestbro@google.com> |
am d259fd2d: Prevent IOOB exception
* commit 'd259fd2d897c741fa5ca1067a4596beeb2e0a938':
Prevent IOOB exception
|
| d259fd2d897c741fa5ca1067a4596beeb2e0a938 |
22-Apr-2013 |
Paul Westbrook <pwestbro@google.com> |
Prevent IOOB exception
The chips code was expecting a space after an email
address when replacing it with a chip. If there is no
extra space (which can happen when receiving an intent)
don't walk off the end of the string
Bug: 8635860
Change-Id: I1d40a08f1cbf11740172b0ea62ab11d656fb23f9
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| c418cf1fd6772039055bd033562d3a78db979779 |
22-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: Icf99d4cc9cada5ef61c4328e6a64fb9d78101079
Auto-generated-cl: translation import
hips/res/values-sw/strings.xml
|
| 38fad8504757ab7d38c9083fb13f866f7435d469 |
15-Apr-2013 |
Tom Taylor <tomtaylor@google.com> |
am f823cf9a: am 49f52e22: Merge "Messaging crash on selecting a contact from the auto complete list in landscape mode" into jb-mr2-dev
* commit 'f823cf9a25b9010dbe3cb79ee188d6affec0e596':
Messaging crash on selecting a contact from the auto complete list in landscape mode
|
| 1aa942760c88925e63c40c2aa2b5aa2c1d37b392 |
15-Apr-2013 |
Scott Kennedy <skennedy@google.com> |
am af7d2e85: am c9daed7a: Don\'t do chip resolving in place
* commit 'af7d2e85c72bebea248efd084f7f469206259d39':
Don't do chip resolving in place
|
| f3a6b6abbbd4c5df615b60ec1a7e89738fe136ff |
15-Apr-2013 |
Ying Wang <wangying@google.com> |
am 15f7d4b3: am a3b03772: Add liblog
* commit '15f7d4b327855c684d1ec11f48331642e8dcada1':
Add liblog
|
| 56997c441fb2515642d8c10f934e55a17e9a3105 |
15-Apr-2013 |
Alice Yang <alice@google.com> |
am 7eff765c: Merge remote-tracking branch \'goog/jb-mr2-dev\' into ur9
* commit '7eff765ccc83a41c8bd7207b0cc0c5227eae9dc5': (73 commits)
StringIndexOutOfBoundsException in Chips during monkey run
Area code gets eaten in Chips
ArrayIndexOutOfBoundsException in RecipientEntry.constructFakeEntry
Ensure appended emails have a comma separator
Import translations. DO NOT MERGE
Repeatable ANR when pasting text into the recipient field
Fix a Dead Loop issue in RecipientEditTextView
Eliminate jank when the user deletes a character thereby removing all contact results in the popup.
Fix problem where part of wrong photo shows
Scroll when result of a contacts lookup appear
Revert "Move location provider lib to frameworks/ex - 2"
Move location provider lib to frameworks/ex - 2
Merge from ur8
SMS text messaging omits numbers in parentheses
add exponential backoff option to OperationScheduler
Merge changes to chips from unbundled branch: update behavior to match new ux spec
cherrypick: Reset maxlines when the user expands text
Fix for panorama icon not always showing up in photo viewer.
Restart loader on attachment cursor updates
Show old results
...
|
| 5ad711e198da82bf47216685bd71ba6b8672f265 |
15-Apr-2013 |
Tom Taylor <tomtaylor@google.com> |
am 49f52e22: Merge "Messaging crash on selecting a contact from the auto complete list in landscape mode" into jb-mr2-dev
* commit '49f52e22c9a56c79490f91a4cba54a0a515e6754':
Messaging crash on selecting a contact from the auto complete list in landscape mode
|
| f823cf9a25b9010dbe3cb79ee188d6affec0e596 |
15-Apr-2013 |
Tom Taylor <tomtaylor@google.com> |
am 49f52e22: Merge "Messaging crash on selecting a contact from the auto complete list in landscape mode" into jb-mr2-dev
* commit '49f52e22c9a56c79490f91a4cba54a0a515e6754':
Messaging crash on selecting a contact from the auto complete list in landscape mode
|
| 49f52e22c9a56c79490f91a4cba54a0a515e6754 |
15-Apr-2013 |
Tom Taylor <tomtaylor@google.com> |
Merge "Messaging crash on selecting a contact from the auto complete list in landscape mode" into jb-mr2-dev
|
| ff0f559596aafab820ce8117a4d1c579b232e251 |
12-Apr-2013 |
Ying Wang <wangying@google.com> |
Don't dist android-common-carousel.
It doesn't build if llvm-rs-cc is not available.
Change-Id: Ib9b970af9b712d25f08c6a13aeae32c98d0a8cf8
arousel/Android.mk
|
| 170f1c09ccbe24e3762cb2b08e56cc30e61b0578 |
11-Apr-2013 |
Scott Kennedy <skennedy@google.com> |
am c9daed7a: Don\'t do chip resolving in place
* commit 'c9daed7a40dbbae4b5fd5b60f32cdca9253644aa':
Don't do chip resolving in place
|
| af7d2e85c72bebea248efd084f7f469206259d39 |
11-Apr-2013 |
Scott Kennedy <skennedy@google.com> |
am c9daed7a: Don\'t do chip resolving in place
* commit 'c9daed7a40dbbae4b5fd5b60f32cdca9253644aa':
Don't do chip resolving in place
|
| c9daed7a40dbbae4b5fd5b60f32cdca9253644aa |
11-Apr-2013 |
Scott Kennedy <skennedy@google.com> |
Don't do chip resolving in place
Make a copy of the text, and do the replacements in this copy, so
that we aren't calling back to any TextView watchers. This speeds up
the process by over 90%.
Bug: 8513563
Change-Id: Iff289f8fe24792f1aef657a9b5b4f3457bcbb946
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| cab5557079c64288867f6c04220b9c9c8860164c |
10-Apr-2013 |
Tom Taylor <tomtaylor@google.com> |
Messaging crash on selecting a contact from the auto complete list in landscape mode
Bug 8540624
Change-Id: If95d1d35cfd0018280ba31a6ef66e9f42f8e1980
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 15f7d4b327855c684d1ec11f48331642e8dcada1 |
10-Apr-2013 |
Ying Wang <wangying@google.com> |
am a3b03772: Add liblog
* commit 'a3b037722065668349e1da3dab26b5ce1509e553':
Add liblog
|
| f48b3f2a690408828f7e02edef840d6e96533b26 |
10-Apr-2013 |
Ying Wang <wangying@google.com> |
am a3b03772: Add liblog
* commit 'a3b037722065668349e1da3dab26b5ce1509e553':
Add liblog
|
| a3b037722065668349e1da3dab26b5ce1509e553 |
10-Apr-2013 |
Ying Wang <wangying@google.com> |
Add liblog
Bug: 8580410
Change-Id: I64962c4175c8bb6e98cdd39efd3982d55082c66d
ariablespeed/jni/Android.mk
|
| 7eff765ccc83a41c8bd7207b0cc0c5227eae9dc5 |
10-Apr-2013 |
Alice Yang <alice@google.com> |
Merge remote-tracking branch 'goog/jb-mr2-dev' into ur9
Change-Id: I1322290c0b5db087429c21750720029814b575d8
|
| 98a6e9acd54b53f6fdc6a9fe3c7a894b67b6bec2 |
09-Apr-2013 |
Daisuke Miyakawa <dmiyakawa@google.com> |
am 6a3b8f9c: am 0d103b25: Add missing AOSP license
* commit '6a3b8f9c323583ed2243afb3f6d6290d68419755':
Add missing AOSP license
|
| cb22f223b92de230711f34b086e8337e0fb791a1 |
09-Apr-2013 |
The Android Open Source Project <initial-contribution@android.com> |
am 2b26a46c: am de764172: am 4f14d40c: Reconcile with jb-release
* commit '2b26a46c20388b2b6c889477b3d40fc8170a5e7d':
|
| 00ad5cae061bd5eaf1e5f6b77d73a125049ba1f1 |
09-Apr-2013 |
Mindy Pereira <mindyp@google.com> |
am 1de84e96: am 9b18bf92: am ffb60406: am 87a5af3e: Break out of infinite loop once we detect an error.
* commit '1de84e96dece45e2d7793e7111a509ef1f9879f6':
|
| 78d50ea7133bf68784aed92e382d897c04fa7f15 |
09-Apr-2013 |
The Android Open Source Project <initial-contribution@android.com> |
am 587e9614: am cb7b9562: am e9792f85: Reconcile with jb-release
* commit '587e96145643ba7570730080aa4fe8865df3712a':
|
| 9150007107cb8b53ced0cc85d2c6054976e4ace8 |
09-Apr-2013 |
Eric Fischer <enf@google.com> |
am 8448c8f6: (-s ours) am 4cdee7a6: (-s ours) am 90817b80: (-s ours) am 8c2158e5: Import translations. DO NOT MERGE
* commit '8448c8f65b6f12c9e20e264cf124f8a398cf0b80':
|
| f50513737df3fa5c3b59f80cbc72ad27ab4b2b78 |
09-Apr-2013 |
Eric Fischer <enf@google.com> |
am d46cb0cd: (-s ours) am 85e9cc3b: (-s ours) Import translations. DO NOT MERGE
* commit 'd46cb0cd3ca94a1aad70d63b21b13ae8a7b616c2':
Import translations. DO NOT MERGE
|
| 14c87891065f67eaf3437d1d9658c8ca52490c9a |
09-Apr-2013 |
Mindy Pereira <mindyp@google.com> |
am 73cbe0af: am 2d0d704a: am 567f6456: am d5c5e621: Merge "Rather than change the text, just remove the waiting for entries row." into jb-dev
* commit '73cbe0af0a5a2d46a02db9a68ab0b893cd3294f5':
|
| 03a83de2b24e262807bce27ebd538fddadb8d41b |
09-Apr-2013 |
Mindy Pereira <mindyp@google.com> |
am b1c730f2: am 7fb1843d: am 1c30f159: am 9c8e43d2: Merge "The mysterious blank item was just a mis-used layout" into jb-dev
* commit 'b1c730f2b3e41cc7a6718db654b28ca8cc7fc86b':
|
| 0237d1c966fec4ba0f48debde8606cdb1f48ee7f |
09-Apr-2013 |
Mindy Pereira <mindyp@google.com> |
am 50d4e942: am 74f9eae8: am 2797dbd5: am 3a36cf75: Merge "Dont hide the keyboard when showing alternates/ selecting a chip." into jb-dev
* commit '50d4e942ff4744a164afa2b4cba3c19cb6fc0c92':
|
| 49378d8e3ee17e2856c796be64fba7e604961bf2 |
09-Apr-2013 |
Mindy Pereira <mindyp@google.com> |
am 1e5b35d7: am df5c47c8: am eba508d0: am 932ec21b: Merge "Null check; back behavior" into jb-dev
* commit '1e5b35d7974a22ab0168cc68281d55ea58eb783c':
|
| a8c57e1172dd6a7184d7c2883879730e48654318 |
09-Apr-2013 |
The Android Open Source Project <initial-contribution@android.com> |
am b69b416c: am 17876646: am 218ea026: Reconcile with jb-release
* commit 'b69b416cc2dfefc7eec5105d3e8bfa0bc58cd92b':
|
| 908a4a972698f611fbeafe18e9d6e52f0ef953f0 |
09-Apr-2013 |
Mindy Pereira <mindyp@google.com> |
am f4d1f9fe: am 8dba5403: am 02840dc1: am 9c5e0403: Fix offset of alternates list dropdown.
* commit 'f4d1f9fe49bcc022def1143d49e8911ba54d4828':
|
| d0291606ad50d4340b540bda0bcb381500bfbb76 |
09-Apr-2013 |
Mindy Pereira <mindyp@google.com> |
am 31a7c911: am 8ae862b7: am 7178b0bc: am 291e619b: Try this out with experimenters to see if the scrolling is reasonable.
* commit '31a7c9112687dd6eae490cfb6a1791069cbd648b':
|
| 463d753d375e2339554d4e8eebd6074a17a5a102 |
09-Apr-2013 |
The Android Open Source Project <initial-contribution@android.com> |
am ff505df0: am f135d5f3: am 21a012ef: Reconcile with jb-release nakasi-factoryrom-release
* commit 'ff505df024175819857c25f10249cf0abe3d1518':
|
| 76f5722937cca51cfbb95aa626fda7bfaa91b8fd |
09-Apr-2013 |
Eric Fischer <enf@google.com> |
am 43db8085: (-s ours) am f351b6c0: (-s ours) am 54e55fee: (-s ours) am 9ec75cef: Import translations. DO NOT MERGE
* commit '43db808500c47eee307815729601def90715c2b0':
|
| 26e2e3128dc0e71f448c22a187503f2f5b4ea8a1 |
09-Apr-2013 |
Eric Fischer <enf@google.com> |
am 741a8156: (-s ours) am 1fe84a2d: (-s ours) Import translations. DO NOT MERGE
* commit '741a81560030f90eddd2fa56b4cb1f7b35bd0a9f':
Import translations. DO NOT MERGE
|
| 7c075daf5e940c29490e0ca014f01db4773d9ee5 |
09-Apr-2013 |
The Android Open Source Project <initial-contribution@android.com> |
am 3dc96b3e: am d444e484: am 9d3bd0a0: Reconcile with jb-release nakasi-factoryrom-release
* commit '3dc96b3e5f59a539fdd1910478c409f53a1fe42f':
|
| ce342c43a90dae12ba3f1444eb643e5b6bf59ce7 |
09-Apr-2013 |
Eric Fischer <enf@google.com> |
am 47e22196: (-s ours) am 146ea842: (-s ours) am b775f325: (-s ours) Import translations. DO NOT MERGE
* commit '47e2219694002b4d5f5210410d0bc460bee1adef':
|
| 81a05f0157eb586c0bec1e7e9f1fd6b319c1b41e |
09-Apr-2013 |
Eric Fischer <enf@google.com> |
am 85eee52a: (-s ours) am 257de1d9: (-s ours) Import translations. DO NOT MERGE
* commit '85eee52a76b68f698c3b739907b6aada4fb7cee3':
Import translations. DO NOT MERGE
|
| 475750c3c2a5c4bc577b7fa04a8f245cc47310ea |
09-Apr-2013 |
Eric Fischer <enf@google.com> |
am f2545189: (-s ours) am 22d63c44: (-s ours) am 8b62d386: (-s ours) Import translations. DO NOT MERGE
* commit 'f254518958cde4cc84a7ee9a1f6923959cbf8b55':
|
| f6fa3e64520e334a7fd4a48fe9f2081cefed6c73 |
09-Apr-2013 |
Eric Fischer <enf@google.com> |
am 3164190b: (-s ours) am 20a3b8c7: (-s ours) Import translations. DO NOT MERGE
* commit '3164190be01d1ae8fdfcaa836c3d14f6d19fd1f9':
Import translations. DO NOT MERGE
|
| bfc6d1ec88d0cf8de308380b3209a09b25deb98b |
09-Apr-2013 |
Eric Fischer <enf@google.com> |
am 8b56f108: (-s ours) am ce538a42: (-s ours) am ff7300c8: (-s ours) Import translations. DO NOT MERGE
* commit '8b56f108f373fc17ae43aab775c426c147ef3bc8':
|
| 829c1e17ce0d5c4966d614e5edd933fda94669b6 |
09-Apr-2013 |
Eric Fischer <enf@google.com> |
am a525a0d7: (-s ours) am f9c54fb1: (-s ours) Import translations. DO NOT MERGE
* commit 'a525a0d75d9577cf3418fd7b89eecc54593eadbf':
Import translations. DO NOT MERGE
|
| 6cfb3f9379c3d4e16255d5a3b95a07a50988d319 |
09-Apr-2013 |
Eric Fischer <enf@google.com> |
am 0f49d40e: (-s ours) am 9922002f: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '0f49d40eb9fbc8c4fe3515b23784dd521d8d4a8d':
Import translations. DO NOT MERGE
|
| 2dc9ccf2ba21dd65a4f9b946ef929667528a8114 |
09-Apr-2013 |
Eric Fischer <enf@google.com> |
am d7dcc2e7: (-s ours) am 83f4d736: (-s ours) am 564269bf: (-s ours) Import translations. DO NOT MERGE
* commit 'd7dcc2e787371ebcc34672fbe3828b32857e5825':
|
| 44298b34f6e42cf30ed0af9a7755f9c2f20e18fe |
09-Apr-2013 |
Alice Yang <alice@google.com> |
am 7e3f1546: am 2e0ba2ec: Merge "Move StaggeredGridView into ex from v4 support library"
* commit '7e3f1546a29667ce7a33ae06858331b01d5afd4c':
Move StaggeredGridView into ex from v4 support library
|
| 85e08acfc4cc80e40f988229b485a905b8ec9e2a |
09-Apr-2013 |
Mindy Pereira <mindyp@google.com> |
am 0ac1c774: am f30ffd13: am 1896ac00: Change text on "done" to say "return"
* commit '0ac1c7749b1d67667da77381c24c0d78ffc26855':
|
| 5d3280a2d6efd87a2f6524f198f6689fa1c200f6 |
09-Apr-2013 |
Mindy Pereira <mindyp@google.com> |
am 327b11ab: am 7e12aaa7: am dd5c5cf8: Use ALIGN_BOTTOM instead of ALIGN_BASELINE
* commit '327b11abdb95a185b0e39d48a9a315a615d962a1':
|
| 472777746bc99833edfda1480167982f37bb8643 |
09-Apr-2013 |
Tom Taylor <tomtaylor@google.com> |
am 0719fbb2: am 32bfa893: am ab2c5069: Contact added to the "To" field of the Messaging app is not getting deleted
* commit '0719fbb2cbf56bf9a219be6e2e47ed29bde35186':
|
| 2b5a4a55d94ba620433c0465f18d2d0e82973ae1 |
09-Apr-2013 |
Tom Taylor <tomtaylor@google.com> |
am 4ebfe2d3: am b7719c17: am 5ba77015: Merge "Don\'t autoselect first item in dropdown" into jb-dev
* commit '4ebfe2d3c0f930878ee5c7823316c58f8b5a2620':
|
| 73e01f77c30da29be25ecf5ff7fb8e99c0028383 |
09-Apr-2013 |
Mindy Pereira <mindyp@google.com> |
am a4f33daf: am 525ec743: am 593f0b4e: Fix alternate reverse lookup query.
* commit 'a4f33dafe61e89c5753758f36d237f60d126343c':
|
| b4d8f076dfa4f2192bd8f6f24ea396c505a7f4bf |
09-Apr-2013 |
Makoto Onuki <omakoto@google.com> |
am 81dc10b4: am 8f1f5423: am f64cbf19: Don\'t show duplicate destinations in alternate popup
* commit '81dc10b475b53aae8040da532dd1b667cbc3e06f':
|
| 6336d3087c03a2d7997e5493a36bad9d34751fa9 |
09-Apr-2013 |
Eric Fischer <enf@google.com> |
am 06e1da6c: (-s ours) am 79361f84: (-s ours) am a97c5fbb: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '06e1da6cb8e53c0c4dc9267bdbaba3ea9c0d7c32':
|
| 8586f490afd8b1cc66e854a24b7771ab9c762283 |
09-Apr-2013 |
Eric Fischer <enf@google.com> |
am e0502615: (-s ours) am 680a9d72: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit 'e050261533ed4fff1c86a0553a5858e22d0305a9':
Import translations. DO NOT MERGE
|
| 6a3b8f9c323583ed2243afb3f6d6290d68419755 |
09-Apr-2013 |
Daisuke Miyakawa <dmiyakawa@google.com> |
am 0d103b25: Add missing AOSP license
* commit '0d103b259b79323ca40e74af1de99c4d3593f5bf':
Add missing AOSP license
|
| 2b26a46c20388b2b6c889477b3d40fc8170a5e7d |
09-Apr-2013 |
The Android Open Source Project <initial-contribution@android.com> |
am de764172: am 4f14d40c: Reconcile with jb-release
* commit 'de764172b85e86436724a47d19f642dacf73b9fe':
|
| 1de84e96dece45e2d7793e7111a509ef1f9879f6 |
09-Apr-2013 |
Mindy Pereira <mindyp@google.com> |
am 9b18bf92: am ffb60406: am 87a5af3e: Break out of infinite loop once we detect an error.
* commit '9b18bf92bf867b5c258b616e0ec39549ce9d03d4':
|
| 587e96145643ba7570730080aa4fe8865df3712a |
09-Apr-2013 |
The Android Open Source Project <initial-contribution@android.com> |
am cb7b9562: am e9792f85: Reconcile with jb-release
* commit 'cb7b9562efda73b162022df58e9ca1d37f3bc25e':
|
| 8448c8f65b6f12c9e20e264cf124f8a398cf0b80 |
09-Apr-2013 |
Eric Fischer <enf@google.com> |
am 4cdee7a6: (-s ours) am 90817b80: (-s ours) am 8c2158e5: Import translations. DO NOT MERGE
* commit '4cdee7a61b140cf1a38b3d1eb1ac596525aa609b':
|
| d46cb0cd3ca94a1aad70d63b21b13ae8a7b616c2 |
09-Apr-2013 |
Eric Fischer <enf@google.com> |
am 85e9cc3b: (-s ours) Import translations. DO NOT MERGE
* commit '85e9cc3b7072025bbb305015120348d3b325210c':
Import translations. DO NOT MERGE
|
| 73cbe0af0a5a2d46a02db9a68ab0b893cd3294f5 |
09-Apr-2013 |
Mindy Pereira <mindyp@google.com> |
am 2d0d704a: am 567f6456: am d5c5e621: Merge "Rather than change the text, just remove the waiting for entries row." into jb-dev
* commit '2d0d704ac8c58438e3849de75c12edb371980668':
|
| b1c730f2b3e41cc7a6718db654b28ca8cc7fc86b |
09-Apr-2013 |
Mindy Pereira <mindyp@google.com> |
am 7fb1843d: am 1c30f159: am 9c8e43d2: Merge "The mysterious blank item was just a mis-used layout" into jb-dev
* commit '7fb1843d7dd54eb78b5d37bd4d5ecf4e8ee5c311':
|
| 50d4e942ff4744a164afa2b4cba3c19cb6fc0c92 |
09-Apr-2013 |
Mindy Pereira <mindyp@google.com> |
am 74f9eae8: am 2797dbd5: am 3a36cf75: Merge "Dont hide the keyboard when showing alternates/ selecting a chip." into jb-dev
* commit '74f9eae893f208979de29ac04e58e403386775f5':
|
| 1e5b35d7974a22ab0168cc68281d55ea58eb783c |
09-Apr-2013 |
Mindy Pereira <mindyp@google.com> |
am df5c47c8: am eba508d0: am 932ec21b: Merge "Null check; back behavior" into jb-dev
* commit 'df5c47c84e5cc97ded2cceca5a2be37fc75c1556':
|
| b69b416cc2dfefc7eec5105d3e8bfa0bc58cd92b |
09-Apr-2013 |
The Android Open Source Project <initial-contribution@android.com> |
am 17876646: am 218ea026: Reconcile with jb-release
* commit '1787664631b8fe722b7102e8dbf569b01c39aefd':
|
| f4d1f9fe49bcc022def1143d49e8911ba54d4828 |
09-Apr-2013 |
Mindy Pereira <mindyp@google.com> |
am 8dba5403: am 02840dc1: am 9c5e0403: Fix offset of alternates list dropdown.
* commit '8dba5403588d16fd4471f6315454143757d0c0af':
|
| 31a7c9112687dd6eae490cfb6a1791069cbd648b |
09-Apr-2013 |
Mindy Pereira <mindyp@google.com> |
am 8ae862b7: am 7178b0bc: am 291e619b: Try this out with experimenters to see if the scrolling is reasonable.
* commit '8ae862b749e701160a26187b350bc2138de179f1':
|
| ff505df024175819857c25f10249cf0abe3d1518 |
09-Apr-2013 |
The Android Open Source Project <initial-contribution@android.com> |
am f135d5f3: am 21a012ef: Reconcile with jb-release nakasi-factoryrom-release
* commit 'f135d5f376688acd78cd5bf0cf66a0c846f8305c':
|
| 43db808500c47eee307815729601def90715c2b0 |
09-Apr-2013 |
Eric Fischer <enf@google.com> |
am f351b6c0: (-s ours) am 54e55fee: (-s ours) am 9ec75cef: Import translations. DO NOT MERGE
* commit 'f351b6c0095a449f72342e88ecd88c18abb414c5':
|
| 741a81560030f90eddd2fa56b4cb1f7b35bd0a9f |
09-Apr-2013 |
Eric Fischer <enf@google.com> |
am 1fe84a2d: (-s ours) Import translations. DO NOT MERGE
* commit '1fe84a2d7b08cb1f2a95757183e0ea55de29b548':
Import translations. DO NOT MERGE
|
| 3dc96b3e5f59a539fdd1910478c409f53a1fe42f |
09-Apr-2013 |
The Android Open Source Project <initial-contribution@android.com> |
am d444e484: am 9d3bd0a0: Reconcile with jb-release nakasi-factoryrom-release
* commit 'd444e484b019cce045e677697b1596fe145c22b9':
|
| 47e2219694002b4d5f5210410d0bc460bee1adef |
09-Apr-2013 |
Eric Fischer <enf@google.com> |
am 146ea842: (-s ours) am b775f325: (-s ours) Import translations. DO NOT MERGE
* commit '146ea8427a124bc27cd77057f4a1cccfda184b87':
|
| 85eee52a76b68f698c3b739907b6aada4fb7cee3 |
09-Apr-2013 |
Eric Fischer <enf@google.com> |
am 257de1d9: (-s ours) Import translations. DO NOT MERGE
* commit '257de1d9d7b7787a62f61bd09e4c8aa59975086c':
Import translations. DO NOT MERGE
|
| f254518958cde4cc84a7ee9a1f6923959cbf8b55 |
09-Apr-2013 |
Eric Fischer <enf@google.com> |
am 22d63c44: (-s ours) am 8b62d386: (-s ours) Import translations. DO NOT MERGE
* commit '22d63c449fd041a87d0fed7215b0e6ece04e5caa':
|
| 3164190be01d1ae8fdfcaa836c3d14f6d19fd1f9 |
09-Apr-2013 |
Eric Fischer <enf@google.com> |
am 20a3b8c7: (-s ours) Import translations. DO NOT MERGE
* commit '20a3b8c7f41350de18128452af9b95d01b5295d9':
Import translations. DO NOT MERGE
|
| 8b56f108f373fc17ae43aab775c426c147ef3bc8 |
09-Apr-2013 |
Eric Fischer <enf@google.com> |
am ce538a42: (-s ours) am ff7300c8: (-s ours) Import translations. DO NOT MERGE
* commit 'ce538a423a9c03555427923f98162b8436245acf':
|
| a525a0d75d9577cf3418fd7b89eecc54593eadbf |
09-Apr-2013 |
Eric Fischer <enf@google.com> |
am f9c54fb1: (-s ours) Import translations. DO NOT MERGE
* commit 'f9c54fb1992f9aa0b010624ea581bc18df123fdb':
Import translations. DO NOT MERGE
|
| 0f49d40eb9fbc8c4fe3515b23784dd521d8d4a8d |
09-Apr-2013 |
Eric Fischer <enf@google.com> |
am 9922002f: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '9922002f58da90295f04c24137cdb2e1dbfbb7a4':
Import translations. DO NOT MERGE
|
| d7dcc2e787371ebcc34672fbe3828b32857e5825 |
09-Apr-2013 |
Eric Fischer <enf@google.com> |
am 83f4d736: (-s ours) am 564269bf: (-s ours) Import translations. DO NOT MERGE
* commit '83f4d7363c7e56844387675fe106f34ff836f8cc':
|
| 7e3f1546a29667ce7a33ae06858331b01d5afd4c |
09-Apr-2013 |
Alice Yang <alice@google.com> |
am 2e0ba2ec: Merge "Move StaggeredGridView into ex from v4 support library"
* commit '2e0ba2ecb4ca8f21a6f42b860184c9c186f36021':
Move StaggeredGridView into ex from v4 support library
|
| 0ac1c7749b1d67667da77381c24c0d78ffc26855 |
09-Apr-2013 |
Mindy Pereira <mindyp@google.com> |
am f30ffd13: am 1896ac00: Change text on "done" to say "return"
* commit 'f30ffd135bc6c2d6b4488267f623eae271f25807':
|
| 327b11abdb95a185b0e39d48a9a315a615d962a1 |
09-Apr-2013 |
Mindy Pereira <mindyp@google.com> |
am 7e12aaa7: am dd5c5cf8: Use ALIGN_BOTTOM instead of ALIGN_BASELINE
* commit '7e12aaa7748c44952d91b88c6f2863c16fe06deb':
|
| 0719fbb2cbf56bf9a219be6e2e47ed29bde35186 |
09-Apr-2013 |
Tom Taylor <tomtaylor@google.com> |
am 32bfa893: am ab2c5069: Contact added to the "To" field of the Messaging app is not getting deleted
* commit '32bfa893e9de281de41b865c207c002ebac72207':
|
| 4ebfe2d3c0f930878ee5c7823316c58f8b5a2620 |
09-Apr-2013 |
Tom Taylor <tomtaylor@google.com> |
am b7719c17: am 5ba77015: Merge "Don\'t autoselect first item in dropdown" into jb-dev
* commit 'b7719c178971456193958253d8164bb352981d10':
|
| a4f33dafe61e89c5753758f36d237f60d126343c |
09-Apr-2013 |
Mindy Pereira <mindyp@google.com> |
am 525ec743: am 593f0b4e: Fix alternate reverse lookup query.
* commit '525ec74378bd0de0f14bd20b52f6d9b9c537a9c0':
|
| 81dc10b475b53aae8040da532dd1b667cbc3e06f |
09-Apr-2013 |
Makoto Onuki <omakoto@google.com> |
am 8f1f5423: am f64cbf19: Don\'t show duplicate destinations in alternate popup
* commit '8f1f5423ffd82c378b373f5c6831513c6ed9df55':
|
| 06e1da6cb8e53c0c4dc9267bdbaba3ea9c0d7c32 |
09-Apr-2013 |
Eric Fischer <enf@google.com> |
am 79361f84: (-s ours) am a97c5fbb: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '79361f84cd616ee46b5522fd34ce27f948b5e701':
|
| e050261533ed4fff1c86a0553a5858e22d0305a9 |
09-Apr-2013 |
Eric Fischer <enf@google.com> |
am 680a9d72: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '680a9d72e3a05733dd83baf22b6a0af7256971c6':
Import translations. DO NOT MERGE
|
| a6ef3aa5e441cd14a8ad197f52ee4609328c65ee |
06-Apr-2013 |
Scott Kennedy <skennedy@google.com> |
am c3a17c96: am da491f04: Prevent a potential ANR
* commit 'c3a17c96b86bff4e387c361127e04d60173a9ca6':
Prevent a potential ANR
|
| c3a17c96b86bff4e387c361127e04d60173a9ca6 |
06-Apr-2013 |
Scott Kennedy <skennedy@google.com> |
am da491f04: Prevent a potential ANR
* commit 'da491f048fb33b572713b4287436c1cac6898670':
Prevent a potential ANR
|
| da491f048fb33b572713b4287436c1cac6898670 |
06-Apr-2013 |
Scott Kennedy <skennedy@google.com> |
Prevent a potential ANR
Move this code into an AsyncTask, since createAlternatesAdapter() can
take a while to return.
Bug: 8519276
Change-Id: I7b3f30ab13ed894e80ac26c365dcb3cbe178dd37
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| cf67253f082152e7675bdd95044bba8c733948a3 |
26-Mar-2013 |
Tom Taylor <tomtaylor@google.com> |
am 4fc5c95c: StringIndexOutOfBoundsException in Chips during monkey run
* commit '4fc5c95c966615b971a8d67dc63b384ae691fb11':
StringIndexOutOfBoundsException in Chips during monkey run
|
| 4fc5c95c966615b971a8d67dc63b384ae691fb11 |
26-Mar-2013 |
Tom Taylor <tomtaylor@google.com> |
StringIndexOutOfBoundsException in Chips during monkey run
Bug 8478568
The code was looking for a comma and not finding one, but since the length
of the token was zero, the "if" clause was executed and tried to make
a substring of length -1.
Change-Id: Ic876fd6b5880c452b27083fb23cf78da994e0225
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 712bfff23007d13a2f4277d369da2df1ef32de6c |
22-Mar-2013 |
Scott Kennedy <skennedy@google.com> |
am 8f0f70c8: am f5ecf6ad: Add unit test for creating fake phone entries
* commit '8f0f70c88a16f784deddfc1511503226b17798ca':
Add unit test for creating fake phone entries
|
| 8f0f70c88a16f784deddfc1511503226b17798ca |
22-Mar-2013 |
Scott Kennedy <skennedy@google.com> |
am f5ecf6ad: Add unit test for creating fake phone entries
* commit 'f5ecf6ad067fb1036199ad5125949aae7ffd9689':
Add unit test for creating fake phone entries
|
| f5ecf6ad067fb1036199ad5125949aae7ffd9689 |
22-Mar-2013 |
Scott Kennedy <skennedy@google.com> |
Add unit test for creating fake phone entries
There was a problem with numbers formatted like:
"(888) 555-1234".
Bug: 8449554
Change-Id: Ic70998104bd5151aba2dca5202bc4f99ced362be
hips/src/com/android/ex/chips/RecipientEditTextView.java
hips/tests/src/com/android/ex/chips/ChipsTest.java
|
| 002cfafcdd520f5f537317c97e79f606795d0fd4 |
22-Mar-2013 |
Tom Taylor <tomtaylor@google.com> |
am b560197a: am f9171bb3: Cherry-pick: Area code gets eaten in Chips
* commit 'b560197a9d2f056545e54cd4746b8ce6dde9c629':
Cherry-pick: Area code gets eaten in Chips
|
| b560197a9d2f056545e54cd4746b8ce6dde9c629 |
22-Mar-2013 |
Tom Taylor <tomtaylor@google.com> |
am f9171bb3: Cherry-pick: Area code gets eaten in Chips
* commit 'f9171bb324685aef7d274cd43427512a56f22522':
Cherry-pick: Area code gets eaten in Chips
|
| 1fe1414f12f92b22ec99e4f27631d9d576d68b34 |
21-Mar-2013 |
Tom Taylor <tomtaylor@google.com> |
am 6413ac66: Area code gets eaten in Chips
* commit '6413ac6689b3d33cf2e42715575d3119d2c90f00':
Area code gets eaten in Chips
|
| f9171bb324685aef7d274cd43427512a56f22522 |
21-Mar-2013 |
Tom Taylor <tomtaylor@google.com> |
Cherry-pick: Area code gets eaten in Chips
Bug 8436028
New code for tokenizing an address stripped the area code from a manually
entered phone number. When chips is in "phone number" mode, call a new
function (essentially the old function before the change) to create
a fake entry directly from the phone number.
Cherry-pick of: I2d62ff24aacd8eadb9086840bd4d003cf39db177
Change-Id: I08d98c2e358fc1b8a70bacf358497a511fd71069
hips/src/com/android/ex/chips/RecipientEditTextView.java
hips/src/com/android/ex/chips/RecipientEntry.java
|
| 6413ac6689b3d33cf2e42715575d3119d2c90f00 |
21-Mar-2013 |
Tom Taylor <tomtaylor@google.com> |
Area code gets eaten in Chips
Bug 8436028
New code for tokenizing an address stripped the area code from a manually
entered phone number. When chips is in "phone number" mode, call a new
function (essentially the old function before the change) to create
a fake entry directly from the phone number.
Change-Id: I2d62ff24aacd8eadb9086840bd4d003cf39db177
hips/src/com/android/ex/chips/RecipientEditTextView.java
hips/src/com/android/ex/chips/RecipientEntry.java
|
| 5fba57de882356f3744ee2ec04e47eeaa779a5b7 |
19-Mar-2013 |
Tom Taylor <tomtaylor@google.com> |
am 0175956f: am 52dba50b: ArrayIndexOutOfBoundsException in RecipientEntry.constructFakeEntry
* commit '0175956f49bb05f18e303c59b86a5224d7c9c294':
ArrayIndexOutOfBoundsException in RecipientEntry.constructFakeEntry
|
| 0175956f49bb05f18e303c59b86a5224d7c9c294 |
19-Mar-2013 |
Tom Taylor <tomtaylor@google.com> |
am 52dba50b: ArrayIndexOutOfBoundsException in RecipientEntry.constructFakeEntry
* commit '52dba50b0e2dfe735484248c6f729950fe4fb7b8':
ArrayIndexOutOfBoundsException in RecipientEntry.constructFakeEntry
|
| 52dba50b0e2dfe735484248c6f729950fe4fb7b8 |
19-Mar-2013 |
Tom Taylor <tomtaylor@google.com> |
ArrayIndexOutOfBoundsException in RecipientEntry.constructFakeEntry
Bug 8423230
Fix a monkey bug that is showing up a lot in MR2. Use the original address
when tokenizing an address fails to return anything.
Cherry-pick of: I4ac42f81aa6e4cbdad058f73bb3a1fd62ab2e138
Change-Id: I0f41f3e169086dcd89e51cdf211985e9bf1a3ade
hips/src/com/android/ex/chips/RecipientEntry.java
|
| bc0b2872950137776411644af57753541142023e |
19-Mar-2013 |
Tom Taylor <tomtaylor@google.com> |
am 0ee09dfc: ArrayIndexOutOfBoundsException in RecipientEntry.constructFakeEntry
* commit '0ee09dfc02251a6932c3787400ce6e188e72ca23':
ArrayIndexOutOfBoundsException in RecipientEntry.constructFakeEntry
|
| 0ee09dfc02251a6932c3787400ce6e188e72ca23 |
19-Mar-2013 |
Tom Taylor <tomtaylor@google.com> |
ArrayIndexOutOfBoundsException in RecipientEntry.constructFakeEntry
Bug 8423230
Fix a monkey bug that is showing up a lot in MR2. Use the original address
when tokenizing an address fails to return anything.
Change-Id: I4ac42f81aa6e4cbdad058f73bb3a1fd62ab2e138
hips/src/com/android/ex/chips/RecipientEntry.java
|
| fd268299134176a0147849ad0dfb93c4c1dc5c65 |
15-Mar-2013 |
jli119X <jianpingx.li@intel.com> |
am b3884208: am 8b7e1e57: Cherry-pick Fix a Dead Loop issue in RecipientEditTextView
* commit 'b38842089f6d901150f8a77e778eca5159d4c5b5':
Cherry-pick Fix a Dead Loop issue in RecipientEditTextView
|
| f391abb4c50acef228b8a6b60f8f32feb7a5dcf1 |
15-Mar-2013 |
Scott Kennedy <skennedy@google.com> |
am e35b1406: am e46cb66d: Always close this cursor
* commit 'e35b1406916bef5623cead8c02e6d8466bb6e968':
Always close this cursor
|
| b38842089f6d901150f8a77e778eca5159d4c5b5 |
15-Mar-2013 |
jli119X <jianpingx.li@intel.com> |
am 8b7e1e57: Cherry-pick Fix a Dead Loop issue in RecipientEditTextView
* commit '8b7e1e5760f236a505ce2e91563e8ac5d75af7cc':
Cherry-pick Fix a Dead Loop issue in RecipientEditTextView
|
| e35b1406916bef5623cead8c02e6d8466bb6e968 |
15-Mar-2013 |
Scott Kennedy <skennedy@google.com> |
am e46cb66d: Always close this cursor
* commit 'e46cb66d4265b6fb8800f9120086151b36011f0f':
Always close this cursor
|
| 8b7e1e5760f236a505ce2e91563e8ac5d75af7cc |
17-Oct-2012 |
jli119X <jianpingx.li@intel.com> |
Cherry-pick Fix a Dead Loop issue in RecipientEditTextView
From AOSP: I01183680289919105dadc28ffd40c8e60dfd6b7e
The old code logic will cause dead loop when pasting phone number
to recipient.
Change-Id: I608f1bf2a5d5651f51be419f7b6125358f2389e2
Author: Jianping Li <jianpingx.li@intel.com>
Signed-off-by: Jianping Li <jianpingx.li@intel.com>
Signed-off-by: Shuo Gao <shuo.gao@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 58793
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| a86b0ce4999020fbbb676a559fc8a8d590c93249 |
14-Mar-2013 |
Scott Kennedy <skennedy@google.com> |
am 5727eeeb: resolved conflicts for merge of 35d3af70 to jb-mr2-dev
* commit '5727eeebd6f7afc15b773dd851a121f51a4ccd75':
Fix a Dead Loop issue in RecipientEditTextView
|
| 5727eeebd6f7afc15b773dd851a121f51a4ccd75 |
14-Mar-2013 |
Scott Kennedy <skennedy@google.com> |
resolved conflicts for merge of 35d3af70 to jb-mr2-dev
Change-Id: If85946ef3dbf82eb3a790adf320765e4a25d91dc
|
| 35d3af70da9740a81eb8eda5a7f87e6f396fb151 |
14-Mar-2013 |
Scott Kennedy <skennedy@android.com> |
am 8682651d: Merge "Fix a Dead Loop issue in RecipientEditTextView"
* commit '8682651d24b0c2cb733b4ef58982aa05f247b3d6':
Fix a Dead Loop issue in RecipientEditTextView
|
| 8682651d24b0c2cb733b4ef58982aa05f247b3d6 |
14-Mar-2013 |
Scott Kennedy <skennedy@android.com> |
Merge "Fix a Dead Loop issue in RecipientEditTextView"
|
| 4815be7686662dae6295c44adf4a7cb54d6e87c6 |
14-Mar-2013 |
Alice Yang <alice@google.com> |
am 4aa10b1b: Merge remote-tracking branch \'goog/jb-ub-mail-ur9\' into merge
* commit '4aa10b1bc14290397756b05e97ff9bc8a3b7564b':
Refactor some of thie chips code
Add a test case for b/8321211
Fix a failing test
Initial clean up of the chips code
Unit test for getBetterRecipient()
Remove waitForDebugger()
Fix the chips tests so they build
Revert an unnecessary change
Ensure appended emails have a comma separator
Don't jump focus out of the View when the Activity starts
Prevent the tab key from double-tabbing
|
| e46cb66d4265b6fb8800f9120086151b36011f0f |
14-Mar-2013 |
Scott Kennedy <skennedy@google.com> |
Always close this cursor
Bug: 8375851
Change-Id: I6aa528091615319722ea7b101bb1cda42c97d122
hips/src/com/android/ex/chips/RecipientAlternatesAdapter.java
|
| 4aa10b1bc14290397756b05e97ff9bc8a3b7564b |
14-Mar-2013 |
Alice Yang <alice@google.com> |
Merge remote-tracking branch 'goog/jb-ub-mail-ur9' into merge
Merge UR8 into MR2.
Change-Id: Ia04852cf84c05ab2ee4898662d347a06d40e5f11
|
| 7d6a64feccb8aaddf11e1b9d78b9e087f6f67533 |
11-Mar-2013 |
Jean-Baptiste Queru <jbq@google.com> |
am 5ee4f94a: (-s ours) am e53461a8: am 129a87f9: am 6b0409db: (-s ours) am 92be9d34: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '5ee4f94a5a4edfd18a69fbdc89786caec4cf3371':
|
| 5ee4f94a5a4edfd18a69fbdc89786caec4cf3371 |
11-Mar-2013 |
Jean-Baptiste Queru <jbq@google.com> |
am e53461a8: am 129a87f9: am 6b0409db: (-s ours) am 92be9d34: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit 'e53461a8db44e66023b87a4b4f249e9fa4689366':
|
| e53461a8db44e66023b87a4b4f249e9fa4689366 |
11-Mar-2013 |
Jean-Baptiste Queru <jbq@google.com> |
am 129a87f9: am 6b0409db: (-s ours) am 92be9d34: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '129a87f9bde4bff575607ebb3ce330161200aec3':
|
| 129a87f9bde4bff575607ebb3ce330161200aec3 |
11-Mar-2013 |
Jean-Baptiste Queru <jbq@google.com> |
am 6b0409db: (-s ours) am 92be9d34: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '6b0409dbc4f33e4adc30390b934c930a5cda4b21':
|
| 6b0409dbc4f33e4adc30390b934c930a5cda4b21 |
11-Mar-2013 |
Jean-Baptiste Queru <jbq@google.com> |
am 92be9d34: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '92be9d34bf220d26f49ed1b328a84d3cad84d21f':
|
| 92be9d34bf220d26f49ed1b328a84d3cad84d21f |
11-Mar-2013 |
Jean-Baptiste Queru <jbq@google.com> |
Reconcile with jb-mr1-release - do not merge
|
| f1d0416bad440e015c8f09c3827acc19d939d71a |
07-Mar-2013 |
Scott Kennedy <skennedy@google.com> |
Refactor some of thie chips code
VisibleRecipientChip and InvisibleRecipientChip had a lot of the same
code, so I moved it all into a delegate class. This resulted in a
bunch of "RecipientChip" classes, so I moved them all into their own
sub-package.
Change-Id: I01dfc931e006270dd37721c73e7bc3c0e7b67515
hips/src/com/android/ex/chips/InvisibleRecipientChip.java
hips/src/com/android/ex/chips/RecipientChip.java
hips/src/com/android/ex/chips/RecipientEditTextView.java
hips/src/com/android/ex/chips/VisibleRecipientChip.java
hips/src/com/android/ex/chips/recipientchip/BaseRecipientChip.java
hips/src/com/android/ex/chips/recipientchip/DrawableRecipientChip.java
hips/src/com/android/ex/chips/recipientchip/InvisibleRecipientChip.java
hips/src/com/android/ex/chips/recipientchip/SimpleRecipientChip.java
hips/src/com/android/ex/chips/recipientchip/VisibleRecipientChip.java
hips/tests/src/com/android/ex/chips/ChipsTest.java
|
| 3201470720e62e3d76f0748468fb5c107df1a6c8 |
04-Mar-2013 |
Scott Kennedy <skennedy@google.com> |
Ensure appended emails have a comma separator
There was some code that checked for comma placement, but that is no
longer necessary. Instead, we verify that the email address has a
trailing comma (plus optional whitespace), and if not, we append a
comma and space, to ensure the address is later chipified correctly.
Bug: 8272316
Change-Id: Ifbb1bae466e3ae15c39d6b90a4bc22edc72a096f
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 563bbd3883a226dd1529170a6df937c8f9c8bd43 |
07-Mar-2013 |
Scott Kennedy <skennedy@google.com> |
Add a test case for b/8321211
Emails like:
"Ex Ample" <example@example.com>
were displaying improperly.
Change-Id: Idd43814352e0c4455733adc13b89eb6fc1aca1bb
hips/src/com/android/ex/chips/RecipientEditTextView.java
hips/tests/src/com/android/ex/chips/ChipsTest.java
|
| b48368b1a1b15fd52c66ff9432429c744c411932 |
07-Mar-2013 |
Scott Kennedy <skennedy@google.com> |
Merge "Initial clean up of the chips code" into jb-ub-mail-ur9
|
| 403e0d211ded97679e8c983481f9972f0a4b22c0 |
07-Mar-2013 |
Scott Kennedy <skennedy@google.com> |
Fix a failing test
Change-Id: Iaa45618d69ea12aa6714bcae36c8f12a253d5df2
hips/src/com/android/ex/chips/RecipientEntry.java
hips/tests/src/com/android/ex/chips/ChipsTest.java
|
| e5d82228c1960115e31f67eb6a3a254d6902e3c5 |
07-Mar-2013 |
Scott Kennedy <skennedy@google.com> |
Initial clean up of the chips code
Change-Id: I56a3dd5968a3ea435d6dcae9256021bac1f74ee6
hips/src/com/android/ex/chips/BaseRecipientAdapter.java
hips/src/com/android/ex/chips/InvisibleRecipientChip.java
hips/src/com/android/ex/chips/RecipientAlternatesAdapter.java
hips/src/com/android/ex/chips/RecipientEditTextView.java
hips/src/com/android/ex/chips/SingleRecipientArrayAdapter.java
hips/src/com/android/ex/chips/VisibleRecipientChip.java
hips/tests/src/com/android/ex/chips/ChipsTest.java
|
| 42ae8ba360efc42cc03d8e754a7ddd7dbd0ae92f |
26-Feb-2013 |
Scott Kennedy <skennedy@google.com> |
Unit test for getBetterRecipient()
Follow-up to Ic53d290431fcabce9607685a6eca45063fea0c9a
Change-Id: I28094ce9744838a1ab859470b22714d539ee8f4c
hips/src/com/android/ex/chips/RecipientAlternatesAdapter.java
hips/tests/src/com/android/ex/chips/RecipientAlternatesAdapterTest.java
|
| faa0e66bddef3f0d61a84636a79efddcd0fd78f8 |
06-Mar-2013 |
Scott Kennedy <skennedy@google.com> |
Remove waitForDebugger()
This was accidentally commited in
I8d2c978c0f346ffa3b8fa0f993efb6df6b0c224a
Change-Id: I56481d0a6ea72ff9c61ee45fd98ad3f91c86460b
hips/tests/src/com/android/ex/chips/ChipsTest.java
|
| 1205e42e9e880aa46e7ec9e02461db9ed1185b2b |
06-Mar-2013 |
Scott Kennedy <skennedy@google.com> |
Fix the chips tests so they build
Change-Id: I8d2c978c0f346ffa3b8fa0f993efb6df6b0c224a
hips/Android.mk
hips/tests/Android.mk
hips/tests/src/com/android/ex/chips/ChipsTest.java
|
| c4f64095df2561916f047274d78fd3a40563f7dd |
05-Mar-2013 |
Scott Kennedy <skennedy@google.com> |
am 5863e75e: Ensure we chipify the original text
* commit '5863e75e34f565429bd943af692d2fa104441901':
Ensure we chipify the original text
|
| e15950dfd05ee4224fb00bc345240ec7a501a487 |
05-Mar-2013 |
Scott Kennedy <skennedy@google.com> |
am 5863e75e: Ensure we chipify the original text
* commit '5863e75e34f565429bd943af692d2fa104441901':
Ensure we chipify the original text
|
| 5863e75e34f565429bd943af692d2fa104441901 |
05-Mar-2013 |
Scott Kennedy <skennedy@google.com> |
Ensure we chipify the original text
We were tokenizing the addresses, then attempting to chipify what we
believed was the ideal way to represent that address as a string. If
this did not match the actual text, it resulted in not everything
being turned into a chip.
By actually using the original text to determine what we make a chip,
we can ensure that everything is always turned into a chip.
Bug: 8321211
Change-Id: I5e7b4d57b6b8895ae5211818451075f461c14eaf
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 23559121fd0a8aead2dea988672e84e80cf82240 |
05-Mar-2013 |
Scott Kennedy <skennedy@google.com> |
am 0159508d: Merge "Fix some jank" into jb-ub-mail-ur8
* commit '0159508d07186a3bf9fcc9a7227047f1bd82084d':
Fix some jank
|
| 2a7f40a289501e749edc017ddc02e627bbe4fd0f |
05-Mar-2013 |
Alice Yang <alice@google.com> |
am 48ad5213: Fix NPE.
* commit '48ad5213e18a67b3a7ec3375214e3900240b889c':
Fix NPE.
|
| 2f0b1678a5cfebc8395bc776c837f63cbcfaf6dd |
05-Mar-2013 |
Scott Kennedy <skennedy@google.com> |
Revert an unnecessary change
I5e9631f258b8d273777c65f3f5460f1aa71f10b1 no longer appears to be
necessary, and was causing jank. It was effectively reverted in Gmail
UR8, and this change just removes the remaining code.
Bug: 8316009
Change-Id: I9c1309cccf57a1e6e7d75eb017aa09add57d2c4a
hips/src/com/android/ex/chips/InvisibleRecipientChip.java
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 3018e9acbdae15abe69c0f9423da52f23048d360 |
04-Mar-2013 |
Scott Kennedy <skennedy@google.com> |
Ensure appended emails have a comma separator
There was some code that checked for comma placement, but that is no
longer necessary. Instead, we verify that the email address has a
trailing comma (plus optional whitespace), and if not, we append a
comma and space, to ensure the address is later chipified correctly.
Bug: 8272316
Change-Id: Ifbb1bae466e3ae15c39d6b90a4bc22edc72a096f
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 8ede04dbd5c09fa6a350e7af2aa49a0bde71725b |
05-Mar-2013 |
Alice Yang <alice@google.com> |
resolved conflicts for merge of c4d46df7 to jb-mr2-dev
Change-Id: I8d4c64832f989c70ef432730ab584e3dc71ad004
|
| ffe5fa1168bc6192b50a5585e637ed507fd5a7de |
05-Mar-2013 |
Scott Kennedy <skennedy@google.com> |
am 0159508d: Merge "Fix some jank" into jb-ub-mail-ur8
* commit '0159508d07186a3bf9fcc9a7227047f1bd82084d':
Fix some jank
|
| 0159508d07186a3bf9fcc9a7227047f1bd82084d |
05-Mar-2013 |
Scott Kennedy <skennedy@google.com> |
Merge "Fix some jank" into jb-ub-mail-ur8
|
| 37aec262244072caea607146ba6d2f247ea2c20d |
05-Mar-2013 |
Scott Kennedy <skennedy@google.com> |
Fix some jank
Removing this line does not bring back the issue this code was
supposed to fix, and it does eliminate the jank.
We can remove all traces of I5e9631f258b8d273777c65f3f5460f1aa71f10b1
in UR9.
Bug: 8254380
Change-Id: I3af3f5e2745aca2667a5a50df306560fe61df5fc
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| e6fee79da937b1ebad3f44ea11274f0b9f80e4ab |
05-Mar-2013 |
Alice Yang <alice@google.com> |
am 48ad5213: Fix NPE.
* commit '48ad5213e18a67b3a7ec3375214e3900240b889c':
Fix NPE.
|
| 48ad5213e18a67b3a7ec3375214e3900240b889c |
04-Mar-2013 |
Alice Yang <alice@google.com> |
Fix NPE.
Missed another place we need null check.
Bug 8312541
Change-Id: I769e1b6ea5e9c028ca46ee896575f0b4a6c4cea5
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 4b77fac23c07c7e49df796cf7de83d6a4aa90ae2 |
04-Mar-2013 |
Alice Yang <alice@google.com> |
am c4d46df7: Fix NPE.
* commit 'c4d46df70d525cb2289bd76fb0b0b12637dbbe23':
Fix NPE.
|
| c4d46df70d525cb2289bd76fb0b0b12637dbbe23 |
04-Mar-2013 |
Alice Yang <alice@google.com> |
Fix NPE.
Change-Id: Ibb2f12a2b7728fe0e6c5bc454bf9bce96f6e827c
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 2416ccd3f57e9eaf7ddda487b29964437514e389 |
28-Feb-2013 |
Scott Kennedy <skennedy@google.com> |
am 211ae635: Reduce chip jank
* commit '211ae63525c02ec914ef020af625ea4e7d8a3b29':
Reduce chip jank
|
| 27696303e8e8bebbeff0faf876b215ed3ca11ead |
28-Feb-2013 |
Scott Kennedy <skennedy@google.com> |
am 211ae635: Reduce chip jank
* commit '211ae63525c02ec914ef020af625ea4e7d8a3b29':
Reduce chip jank
|
| 211ae63525c02ec914ef020af625ea4e7d8a3b29 |
27-Feb-2013 |
Scott Kennedy <skennedy@google.com> |
Reduce chip jank
Put every email address in a chip, so we don't have jank as text
addresses are replaced with chips.
Bug: 8254380
Change-Id: I39d435a9e29c6d9cb2b5f5f69a103ac7a7ab4a3d
hips/src/com/android/ex/chips/InvisibleRecipientChip.java
hips/src/com/android/ex/chips/RecipientAlternatesAdapter.java
hips/src/com/android/ex/chips/RecipientEditTextView.java
hips/src/com/android/ex/chips/VisibleRecipientChip.java
|
| 38c3a78aa9e4525353d65540b38c3221148f0327 |
26-Feb-2013 |
Scott Kennedy <skennedy@google.com> |
am 8c386766: Use the best contact result for chips
* commit '8c3867660cd9e2ebb34e5efc62aecdad76a65c6d':
Use the best contact result for chips
|
| d76cfb4cc636f3f8819f75481ddb500fbee1e5f4 |
25-Feb-2013 |
Scott Kennedy <skennedy@google.com> |
am 8c386766: Use the best contact result for chips
* commit '8c3867660cd9e2ebb34e5efc62aecdad76a65c6d':
Use the best contact result for chips
|
| 8c3867660cd9e2ebb34e5efc62aecdad76a65c6d |
25-Feb-2013 |
Scott Kennedy <skennedy@google.com> |
Use the best contact result for chips
In situations where multiple results are returned for one contact
lookup, we were taking the last result. Instead, we should determine
which result is best (based on display name and photo availability),
and use it.
Bug: 8254525
Change-Id: Ic53d290431fcabce9607685a6eca45063fea0c9a
hips/src/com/android/ex/chips/RecipientAlternatesAdapter.java
|
| 8189b1c116661428247585c56c8b16d98509becd |
21-Feb-2013 |
Alice Yang <alice@google.com> |
Merge 'goog/jb-ub-mail-ur8' into master
Change-Id: I7d1e9583bca936a770334252dc0046417b642298
|
| 438972e5da3a847e0717b4d030cb579f53195b43 |
19-Feb-2013 |
Scott Kennedy <skennedy@google.com> |
am 2727f969: Ensure all addresses turn into chips
* commit '2727f969d0ce46cdd16cd77e1dc21f3a636217d2':
Ensure all addresses turn into chips
|
| 2727f969d0ce46cdd16cd77e1dc21f3a636217d2 |
16-Feb-2013 |
Scott Kennedy <skennedy@google.com> |
Ensure all addresses turn into chips
If an address wasn't properly resolved, it was left as text. This
change processes all unresolved addresses into chips.
Bug: 8201904
Change-Id: Iae7718d97c7c1167bdc464ef372b171743524712
hips/src/com/android/ex/chips/RecipientAlternatesAdapter.java
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 58d61cab309ff1b5a62bc699ddb41118dc70c337 |
15-Feb-2013 |
Scott Kennedy <skennedy@google.com> |
am 7b1c6d7d: Add a toString() to make debugging easier
* commit '7b1c6d7dea5f4e3fcb3eb4f137b2e510b394ea79':
Add a toString() to make debugging easier
|
| 7b1c6d7dea5f4e3fcb3eb4f137b2e510b394ea79 |
15-Feb-2013 |
Scott Kennedy <skennedy@google.com> |
Add a toString() to make debugging easier
Change-Id: I0826eedd858ffd942e1371ec1c4d73d4d98177bd
hips/src/com/android/ex/chips/RecipientEntry.java
|
| 1a76449a643ab1e544da54514cf09f6f17f4d075 |
15-Feb-2013 |
Paul Westbrook <pwestbro@google.com> |
Merge branch 'goog/jb-ub-mail-ur8' into master
Conflicts:
photoviewer/AndroidManifest.xml
photoviewer/res/values/dimen.xml
photoviewer/src/com/android/ex/photo/Intents.java
photoviewer/src/com/android/ex/photo/PhotoViewActivity.java
photoviewer/src/com/android/ex/photo/adapters/BaseCursorPagerAdapter.java
photoviewer/src/com/android/ex/photo/adapters/BaseFragmentPagerAdapter.java
photoviewer/src/com/android/ex/photo/adapters/PhotoPagerAdapter.java
photoviewer/src/com/android/ex/photo/fragments/PhotoViewFragment.java
photoviewer/src/com/android/ex/photo/provider/PhotoContract.java
photoviewer/src/com/android/ex/photo/util/ImageUtils.java
photoviewer/src/com/android/ex/photo/views/PhotoView.java
Change-Id: Icb06b228f0eab1f828a21507ec2fbe7ede998536
|
| b305f499d4a2f7fe783cc11ecf68eab70a8c6d83 |
15-Feb-2013 |
Scott Kennedy <skennedy@google.com> |
Merge "Don't jump focus out of the View when the Activity starts" into jb-ub-mail-ur9
|
| 348c459fd722f115ffeb3d5cec5950088fa1bde8 |
15-Feb-2013 |
Scott Kennedy <skennedy@google.com> |
Don't jump focus out of the View when the Activity starts
In an Activity where a RecipientEditTextView has initial focus, if
you start the Activity by pressing the enter key on a keyboard (like
on a button), it would appear the onKeyUp event is handled in the new
Activity, causing this View's enter-handling logic to run.
By moving the logic into onKeyDown, we can avoid this situation.
Bug: 8013052
Change-Id: I48d3e903071954f5b73f4860ea87733c6eacd2dd
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| a90eaa29effcb64a96847ad07173032d7ca3be41 |
15-Feb-2013 |
Scott Kennedy <skennedy@google.com> |
Prevent the tab key from double-tabbing
Tabbing from this field results in skipping ahead two fields.
The platform (TextView#dokeyDown()) catches the tab in onKeyDown(),
and we were catching it in onKeyUp(), causing it to be handled twice.
Everything seems to work as expected with this code removed.
Change-Id: I1386b374e93c8de2a9dfb4c57804222a2ad88002
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 9f1ab148925b098cec90d06992ade0fca2889a14 |
04-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: I6f9183aa473c483afec9a293cd22914471faf9c5
Auto-generated-cl: translation import
hips/res/values-pt-rPT/strings.xml
|
| e032f315b6f95896ff471e92a20a42159d53fa6a |
01-Feb-2013 |
Scott Kennedy <skennedy@google.com> |
Hitting enter on a physical keyboard should auto-complete
We need to treat KEYCODE_ENTER the same way as KEYCODE_DPAD_CENTER.
Bug: 8077506
Change-Id: Ib129068f851c3927bd572edb0ae0edfb6c422ceb
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 31f3038a4d5cde24c1f61653af682bd6cc033471 |
30-Jan-2013 |
Scott Kennedy <skennedy@google.com> |
Show contact addresses while chips load
When the "more" chip (eg +3) is expanded, we need to display the
addresses as text while we go searching for the real contacts.
Bug: 8099861
Change-Id: I5e9631f258b8d273777c65f3f5460f1aa71f10b1
hips/src/com/android/ex/chips/InvisibleRecipientChip.java
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| a0856791ae8d9393bf6e4c2c809bac1a19dd837b |
30-Jan-2013 |
Scott Kennedy <skennedy@google.com> |
Fix advancing to the next field when "Return" is pressed
The onEditorActionListener was not being called.
By explicitly setting EditorInfo.actionId in addition to actionLabel,
the onEditorActionListner is being called again.
Bug: 8091676
Change-Id: I349e77abe64ab8492678e1c8dda4fb70f4503a85
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 64da517d8aad0fb63644a29ff8797fc9b46839c9 |
15-Jan-2013 |
Tom Taylor <tomtaylor@google.com> |
Repeatable ANR when pasting text into the recipient field
Bug 7998195
Add an escape clause to an infinite loop. The bug is 100% repro.
Change-Id: If4d4409a992ce29176ac8ef544a71b3649c1e6ee
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 05a1a8479839a7feb3e765c0ce5223b7a20826ce |
17-Oct-2012 |
jli119X <jianpingx.li@intel.com> |
Fix a Dead Loop issue in RecipientEditTextView
The old code logic will cause dead loop when pasting phone number
to recipient.
Change-Id: I01183680289919105dadc28ffd40c8e60dfd6b7e
Author: Jianping Li <jianpingx.li@intel.com>
Signed-off-by: Jianping Li <jianpingx.li@intel.com>
Signed-off-by: Shuo Gao <shuo.gao@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 58793
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| f1673f4320c6514fa6f6d2854c1656bcf8075ab5 |
21-Dec-2012 |
mindyp <mindyp@google.com> |
Properly handle keyboard selection
Fixes b/7909211 Gmail compose always select the first recipient when selecting different recipient using down arrow keys of connected BT keyboard
Change-Id: Ib59045ae33e8fd6d4b7a5e2767fda356c6b6ca7a
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 9fdfd2d5863f4fe8570db3e03df4fec98c20b655 |
20-Dec-2012 |
Paul Westbrook <pwestbro@google.com> |
Delete framework/ex's photo viewer
Bug: 7389288
Change-Id: I3139681fcd24c796115386e70a9fc3220fca8d87
hotoviewer/Android.mk
hotoviewer/AndroidManifest.xml
hotoviewer/res/drawable-hdpi/actionbar_translucent.9.png
hotoviewer/res/drawable-hdpi/ic_menu_refresh_holo_dark.png
hotoviewer/res/drawable-mdpi/actionbar_translucent.9.png
hotoviewer/res/drawable-mdpi/ic_menu_refresh_holo_dark.png
hotoviewer/res/drawable-xhdpi/ic_menu_refresh_holo_dark.png
hotoviewer/res/drawable/default_image.png
hotoviewer/res/layout/photo_activity_view.xml
hotoviewer/res/layout/photo_fragment_view.xml
hotoviewer/res/values-af/strings.xml
hotoviewer/res/values-am/strings.xml
hotoviewer/res/values-ar/strings.xml
hotoviewer/res/values-be/strings.xml
hotoviewer/res/values-bg/strings.xml
hotoviewer/res/values-ca/strings.xml
hotoviewer/res/values-cs/strings.xml
hotoviewer/res/values-da/strings.xml
hotoviewer/res/values-de/strings.xml
hotoviewer/res/values-el/strings.xml
hotoviewer/res/values-en-rGB/strings.xml
hotoviewer/res/values-es-rUS/strings.xml
hotoviewer/res/values-es/strings.xml
hotoviewer/res/values-et/strings.xml
hotoviewer/res/values-fa/strings.xml
hotoviewer/res/values-fi/strings.xml
hotoviewer/res/values-fr/strings.xml
hotoviewer/res/values-hi/strings.xml
hotoviewer/res/values-hr/strings.xml
hotoviewer/res/values-hu/strings.xml
hotoviewer/res/values-in/strings.xml
hotoviewer/res/values-it/strings.xml
hotoviewer/res/values-iw/strings.xml
hotoviewer/res/values-ja/strings.xml
hotoviewer/res/values-ko/strings.xml
hotoviewer/res/values-lt/strings.xml
hotoviewer/res/values-lv/strings.xml
hotoviewer/res/values-ms/strings.xml
hotoviewer/res/values-nb/strings.xml
hotoviewer/res/values-nl/strings.xml
hotoviewer/res/values-pl/strings.xml
hotoviewer/res/values-pt-rPT/strings.xml
hotoviewer/res/values-pt/strings.xml
hotoviewer/res/values-ro/strings.xml
hotoviewer/res/values-ru/strings.xml
hotoviewer/res/values-sk/strings.xml
hotoviewer/res/values-sl/strings.xml
hotoviewer/res/values-sr/strings.xml
hotoviewer/res/values-sv/strings.xml
hotoviewer/res/values-sw/strings.xml
hotoviewer/res/values-th/strings.xml
hotoviewer/res/values-tl/strings.xml
hotoviewer/res/values-tr/strings.xml
hotoviewer/res/values-uk/strings.xml
hotoviewer/res/values-vi/strings.xml
hotoviewer/res/values-zh-rCN/strings.xml
hotoviewer/res/values-zh-rTW/strings.xml
hotoviewer/res/values-zu/strings.xml
hotoviewer/res/values/colors.xml
hotoviewer/res/values/constants.xml
hotoviewer/res/values/dimen.xml
hotoviewer/res/values/strings.xml
hotoviewer/res/values/themes.xml
hotoviewer/sample/Android.mk
hotoviewer/sample/AndroidManifest.xml
hotoviewer/sample/assets/blah.png
hotoviewer/sample/assets/galaxy.png
hotoviewer/sample/assets/johannson.png
hotoviewer/sample/assets/planets.png
hotoviewer/sample/res/drawable-hdpi/ic_action_search.png
hotoviewer/sample/res/drawable-hdpi/ic_launcher.png
hotoviewer/sample/res/drawable-mdpi/ic_action_search.png
hotoviewer/sample/res/drawable-mdpi/ic_launcher.png
hotoviewer/sample/res/drawable-xhdpi/ic_action_search.png
hotoviewer/sample/res/drawable-xhdpi/ic_launcher.png
hotoviewer/sample/res/layout/activity_main.xml
hotoviewer/sample/res/menu/activity_main.xml
hotoviewer/sample/res/values-af/strings.xml
hotoviewer/sample/res/values-am/strings.xml
hotoviewer/sample/res/values-ar/strings.xml
hotoviewer/sample/res/values-be/strings.xml
hotoviewer/sample/res/values-bg/strings.xml
hotoviewer/sample/res/values-ca/strings.xml
hotoviewer/sample/res/values-cs/strings.xml
hotoviewer/sample/res/values-da/strings.xml
hotoviewer/sample/res/values-de/strings.xml
hotoviewer/sample/res/values-el/strings.xml
hotoviewer/sample/res/values-en-rGB/strings.xml
hotoviewer/sample/res/values-es-rUS/strings.xml
hotoviewer/sample/res/values-es/strings.xml
hotoviewer/sample/res/values-et/strings.xml
hotoviewer/sample/res/values-fa/strings.xml
hotoviewer/sample/res/values-fi/strings.xml
hotoviewer/sample/res/values-fr/strings.xml
hotoviewer/sample/res/values-hi/strings.xml
hotoviewer/sample/res/values-hr/strings.xml
hotoviewer/sample/res/values-hu/strings.xml
hotoviewer/sample/res/values-in/strings.xml
hotoviewer/sample/res/values-it/strings.xml
hotoviewer/sample/res/values-iw/strings.xml
hotoviewer/sample/res/values-ja/strings.xml
hotoviewer/sample/res/values-ko/strings.xml
hotoviewer/sample/res/values-lt/strings.xml
hotoviewer/sample/res/values-lv/strings.xml
hotoviewer/sample/res/values-ms/strings.xml
hotoviewer/sample/res/values-nb/strings.xml
hotoviewer/sample/res/values-nl/strings.xml
hotoviewer/sample/res/values-pl/strings.xml
hotoviewer/sample/res/values-pt-rPT/strings.xml
hotoviewer/sample/res/values-pt/strings.xml
hotoviewer/sample/res/values-ro/strings.xml
hotoviewer/sample/res/values-ru/strings.xml
hotoviewer/sample/res/values-sk/strings.xml
hotoviewer/sample/res/values-sl/strings.xml
hotoviewer/sample/res/values-sr/strings.xml
hotoviewer/sample/res/values-sv/strings.xml
hotoviewer/sample/res/values-sw/strings.xml
hotoviewer/sample/res/values-th/strings.xml
hotoviewer/sample/res/values-tl/strings.xml
hotoviewer/sample/res/values-tr/strings.xml
hotoviewer/sample/res/values-uk/strings.xml
hotoviewer/sample/res/values-vi/strings.xml
hotoviewer/sample/res/values-zh-rCN/strings.xml
hotoviewer/sample/res/values-zh-rTW/strings.xml
hotoviewer/sample/res/values-zu/strings.xml
hotoviewer/sample/res/values/dimens.xml
hotoviewer/sample/res/values/strings.xml
hotoviewer/sample/res/values/styles.xml
hotoviewer/sample/src/com/example/photoviewersample/MainActivity.java
hotoviewer/sample/src/com/example/photoviewersample/SampleProvider.java
hotoviewer/src/com/android/ex/photo/Intents.java
hotoviewer/src/com/android/ex/photo/PhotoViewActivity.java
hotoviewer/src/com/android/ex/photo/PhotoViewPager.java
hotoviewer/src/com/android/ex/photo/adapters/BaseCursorPagerAdapter.java
hotoviewer/src/com/android/ex/photo/adapters/BaseFragmentPagerAdapter.java
hotoviewer/src/com/android/ex/photo/adapters/PhotoPagerAdapter.java
hotoviewer/src/com/android/ex/photo/fragments/PhotoViewFragment.java
hotoviewer/src/com/android/ex/photo/loaders/PhotoBitmapLoader.java
hotoviewer/src/com/android/ex/photo/loaders/PhotoPagerLoader.java
hotoviewer/src/com/android/ex/photo/provider/PhotoContract.java
hotoviewer/src/com/android/ex/photo/util/Exif.java
hotoviewer/src/com/android/ex/photo/util/ImageUtils.java
hotoviewer/src/com/android/ex/photo/views/PhotoView.java
hotoviewer/src/com/android/ex/photo/views/ProgressBarWrapper.java
|
| bbac6435112320972b60a74d0e39273520740a39 |
18-Dec-2012 |
mindyp <mindyp@google.com> |
Make sure we correctly handle the " " at the end of a chip
Fixes b/7727633 After reply focusing on To field puts cursor right next to chip
Change-Id: I13e7ede4385cf96e6eb0588adaccf0f67424b0ce
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 7cd3868f4d53989de1292998525402a819b3b450 |
18-Dec-2012 |
Laurent Tu <laurentt@google.com> |
Merge "Revert "Move location provider lib to frameworks/ex - 2""
|
| f6679792c7bf6b4f917b65af049c4b1301e463fe |
17-Dec-2012 |
mindyp <mindyp@google.com> |
am 9f662b7d: am a918fec5: Merge "Eliminate jank when the user deletes a character thereby removing all contact results in the popup." into jb-mr1.1-dev
* commit '9f662b7d0561a46a0250702385084c48efe9ca24':
Eliminate jank when the user deletes a character thereby removing all contact results in the popup.
|
| 9f662b7d0561a46a0250702385084c48efe9ca24 |
17-Dec-2012 |
mindyp <mindyp@google.com> |
am a918fec5: Merge "Eliminate jank when the user deletes a character thereby removing all contact results in the popup." into jb-mr1.1-dev
* commit 'a918fec5a1dc028e9b04a71d0e37ee1bab6caa61':
Eliminate jank when the user deletes a character thereby removing all contact results in the popup.
|
| a918fec5a1dc028e9b04a71d0e37ee1bab6caa61 |
17-Dec-2012 |
mindyp <mindyp@google.com> |
Merge "Eliminate jank when the user deletes a character thereby removing all contact results in the popup." into jb-mr1.1-dev
|
| 8371daf249e72d33cf1652a8d52570fb56dd064b |
17-Dec-2012 |
mindyp <mindyp@google.com> |
Eliminate jank when adding/ removing character
Change-Id: If09ad14830f5ccb490006cc342d83806057ffa34
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 09bb480c04705138b7329d425181a9869b34f8e9 |
17-Dec-2012 |
mindyp <mindyp@google.com> |
Eliminate jank when the user deletes a character thereby removing all contact results in the popup.
part of b/7727257] Jank when replying to or forwarding a message in gmail
Change-Id: If95716847260d802e527a4ad012ea7f8085d6930
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 0d9a747070daed3ba994b0390c043acfab46506e |
15-Dec-2012 |
Mindy Pereira <mindyp@google.com> |
am e9c8a53c: am 7d7b83bc: Merge "Fix problem where part of wrong photo shows" into jb-mr1.1-dev
* commit 'e9c8a53c11e7092344f49e965150037ca8581dbe':
Fix problem where part of wrong photo shows
|
| e9c8a53c11e7092344f49e965150037ca8581dbe |
15-Dec-2012 |
Mindy Pereira <mindyp@google.com> |
am 7d7b83bc: Merge "Fix problem where part of wrong photo shows" into jb-mr1.1-dev
* commit '7d7b83bc96877b1e263fe4cf8fe200934b61322d':
Fix problem where part of wrong photo shows
|
| 7d7b83bc96877b1e263fe4cf8fe200934b61322d |
15-Dec-2012 |
Mindy Pereira <mindyp@google.com> |
Merge "Fix problem where part of wrong photo shows" into jb-mr1.1-dev
|
| e53c7a6b1fe833d400ae06ad17f4be406d1653ff |
15-Dec-2012 |
mindyp <mindyp@google.com> |
Merge commit 'f54b3505' into manualmerge
Conflicts:
chips/src/com/android/ex/chips/RecipientEditTextView.java
Change-Id: I2a8d55d6db3fdb4aab6ea788b685a047dcf9ed9d
|
| 8f7bdab470c48a5e53c9a8a54ae9eb7f59827a32 |
15-Dec-2012 |
Paul Westbrook <pwestbro@google.com> |
Fix problem where part of wrong photo shows
Fix a problem when swiping through a few image attachments
where, when reaching the end, part of the N-1 photo is shown while
the blue glow is being shown on the right side
Bug: 7745114
Cherry-pick of https://googleplex-android-review.googlesource.com/#/c/260544/
Change-Id: Ic7d8b4213303a7e06c902b117e1e68b40bd8e1c3
hotoviewer/res/values/dimen.xml
hotoviewer/src/com/android/ex/photo/PhotoViewActivity.java
|
| f1afd3f69cbaa2c37929fe0361143e3aa00daf1f |
15-Dec-2012 |
Paul Westbrook <pwestbro@google.com> |
Merge "Fix problem where part of wrong photo shows" into jb-ub-mail-ur8
|
| f54b35052841b2618a91bff687700203203ef784 |
15-Dec-2012 |
mindyp <mindyp@google.com> |
am 3665fb7a: Scroll when result of a contacts lookup appear
* commit '3665fb7aaf0948f694e2d28ab76e1f5e4befb45d':
Scroll when result of a contacts lookup appear
|
| 30106ab658e054bfb96cadfe4e3decf800a3f304 |
15-Dec-2012 |
Paul Westbrook <pwestbro@google.com> |
Fix problem where part of wrong photo shows
Fix a problem when swiping through a few image attachments
where, when reaching the end, part of the N-1 photo is shown while
the blue glow is being shown on the right side
Bug: 7745114
Change-Id: Ic7d8b4213303a7e06c902b117e1e68b40bd8e1c3
hotoviewer/res/values/dimen.xml
hotoviewer/src/com/android/ex/photo/PhotoViewActivity.java
|
| 3665fb7aaf0948f694e2d28ab76e1f5e4befb45d |
14-Dec-2012 |
mindyp <mindyp@google.com> |
Scroll when result of a contacts lookup appear
Fixes b/7727257 Jank when replying to or forwarding a message in gmail
Change-Id: I620fb31adcb80ca7a6a86c64c987969bc630429d
hips/src/com/android/ex/chips/BaseRecipientAdapter.java
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 70d41146a39058c47eee5c505cae6a6a2c1409f9 |
14-Dec-2012 |
mindyp <mindyp@google.com> |
Scroll when results appear
Fixes b/7727257 Jank when replying to or forwarding a message in gmail
Change-Id: I6fbb574ac724772d541d063192a5e0e59b776360
hips/src/com/android/ex/chips/BaseRecipientAdapter.java
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| eb061b1b902c41fcd81c875540f1c153f01d8814 |
12-Dec-2012 |
Laurent Tu <laurentt@google.com> |
Revert "Move location provider lib to frameworks/ex - 2"
This reverts commit ecd899f82db54deef5d25831f3577df85cce1c74.
ocation/Android.mk
ocation/README.txt
ocation/com.android.location.provider.xml
ocation/src/com/android/location/provider/GeocodeProvider.java
ocation/src/com/android/location/provider/LocationProviderBase.java
ocation/src/com/android/location/provider/LocationRequestUnbundled.java
ocation/src/com/android/location/provider/ProviderPropertiesUnbundled.java
ocation/src/com/android/location/provider/ProviderRequestUnbundled.java
|
| 0cf347e69473d2259194257d5a4b9aa103c8e448 |
10-Dec-2012 |
mindyp <mindyp@google.com> |
Extend reverse lookup to also check GAL
Fixes b/7499733 gal address sometimes treated as message-only address in chips
Change-Id: I3fa79a43c672b1d2eac72dae6a9dfaf8701be977
hips/src/com/android/ex/chips/BaseRecipientAdapter.java
hips/src/com/android/ex/chips/RecipientAlternatesAdapter.java
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| ab5b5b7bb592d8c7281c0bba3c5d62f9c9ad3cd4 |
10-Dec-2012 |
mindyp <mindyp@google.com> |
Use same default contact photo for list items and chips
Fixes b/7706601 which asset do we want to use for the default contact icon?
Change-Id: I0bd414aefb783a4a64ce0041dcd8f7f8d5911b83
hips/res/drawable-hdpi/ic_contact_picture.png
hips/res/drawable-mdpi/ic_contact_picture.png
hips/res/drawable-xhdpi/ic_contact_picture.png
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| ecd899f82db54deef5d25831f3577df85cce1c74 |
05-Dec-2012 |
Laurent Tu <laurentt@google.com> |
Move location provider lib to frameworks/ex - 2
Move location provider lib to frameworks/ex so that it can be re-used in
GmsCore.
This is the frameworks/ex part of the CL (2).
Note that the package name wasn't changed to
com.android.ex.location.provider because of API stability reasons.
Change-Id: I41f7ce81910f7d1e3143f8809fc065543ce1039e
ocation/Android.mk
ocation/README.txt
ocation/com.android.location.provider.xml
ocation/src/com/android/location/provider/GeocodeProvider.java
ocation/src/com/android/location/provider/LocationProviderBase.java
ocation/src/com/android/location/provider/LocationRequestUnbundled.java
ocation/src/com/android/location/provider/ProviderPropertiesUnbundled.java
ocation/src/com/android/location/provider/ProviderRequestUnbundled.java
|
| 44eb5f95c00a748e3a391f34ee27ddedd3ec9500 |
03-Dec-2012 |
mindyp <mindyp@google.com> |
Merge from ur8
Merges in:
Fixup delete logic
Its only a delete if the user has removed a single character,
otherwise, we are looking at replacement, probably from a reverse lookup
Ia7c7b94d9e2fb037cb19abdb6696f7df0d351856
Make sure we only use the invisible chips optimization if we are showing the "more" chip
In the case of calendar, we never shrink the field, so this optimization
can't be used
I30e3312b8e686be5143f96d3d2820e023158957d
mMaxLines was not being set correctly; dont draw hidden chips on first render pass
mMaxLines was always zero
Setting the value correctly avoids an extra layout which makes it faster
to render chips
Use an "invisible" recipient chip for anything > than max chips we can show before
showing the more chip; this avoids a lot of unnecessary drawing and decoding of 9 patches
in the first pass; once these are resolved (or the user makes them visible), they will be correctly
drawn as visible chips
Part of b/7492291 First 2 contacts takes too long to resolve into chips when there are many contacts
I37817381f93efb968940031d8a8b77fb62c8919a
Change-Id: I4cbe5eacaa6fc5d1d94a5663133da82621582824
hips/res/values/dimen.xml
hips/src/com/android/ex/chips/BaseRecipientAdapter.java
hips/src/com/android/ex/chips/InvisibleRecipientChip.java
hips/src/com/android/ex/chips/RecipientAlternatesAdapter.java
hips/src/com/android/ex/chips/RecipientChip.java
hips/src/com/android/ex/chips/RecipientEditTextView.java
hips/src/com/android/ex/chips/RecipientEntry.java
hips/src/com/android/ex/chips/VisibleRecipientChip.java
|
| 5a96b360e51cd4c0fd808e6f29e4e6377718be55 |
03-Dec-2012 |
mindyp <mindyp@google.com> |
Fixup delete logic
Its only a delete if the user has removed a single character,
otherwise, we are looking at replacement, probably from a reverse lookup
Change-Id: Ia7c7b94d9e2fb037cb19abdb6696f7df0d351856
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| d5e65e2e3ab0407ac9b538074b0695d18c49b649 |
03-Dec-2012 |
mindyp <mindyp@google.com> |
Make sure we only use the invisible chips optimization if we are showing the "more" chip
In the case of calendar, we never shrink the field, so this optimization
can't be used
Change-Id: I30e3312b8e686be5143f96d3d2820e023158957d
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 0a9b6b9d977cb4a51a5920721eb3f594e35aca98 |
01-Dec-2012 |
mindyp <mindyp@google.com> |
mMaxLines was not being set correctly; dont draw hidden chips on first render pass
mMaxLines was always zero
Setting the value correctly avoids an extra layout which makes it faster
to render chips
Use an "invisible" recipient chip for anything > than max chips we can show before
showing the more chip; this avoids a lot of unnecessary drawing and decoding of 9 patches
in the first pass; once these are resolved (or the user makes them visible), they will be correctly
drawn as visible chips
Part of b/7492291 First 2 contacts takes too long to resolve into chips when there are many contacts
Change-Id: I37817381f93efb968940031d8a8b77fb62c8919a
hips/res/values/dimen.xml
hips/src/com/android/ex/chips/InvisibleRecipientChip.java
hips/src/com/android/ex/chips/RecipientChip.java
hips/src/com/android/ex/chips/RecipientEditTextView.java
hips/src/com/android/ex/chips/VisibleRecipientChip.java
|
| eec98f9f7701a66f3f9f0eaceefbf5a87e218978 |
01-Dec-2012 |
mindyp <mindyp@google.com> |
Remove unnecessary call to tokenize
the address is already tokenized
Part of b/7492291 First 2 contacts takes too long to resolve into chips when there are many contacts
Change-Id: Ibefe1ce45ea8309e51c9cf25bf058d88ebf75ec1
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 82c598e17428a0c7049bc30c9a16eea4bb951d39 |
27-Nov-2012 |
Paul Westbrook <pwestbro@google.com> |
am 4bd6592a: am 18bc55d1: Merge remote-tracking branch \'goog/jb-ub-mail\' into gmailmerge
* commit '4bd6592a9709c6dab7ba46d1b548d83525e3485d':
Reduce time until first revision of a chip is drawn.
dont replace the text in the text field when editing a fake or generated entry
Make sure that we take the existng temporary contact, where available.
Make sure that the last "fake entry" chip is correctly committed
Update chips to follow new ux spec for replacement
Reset maxlines when the user expands text
Fix for panorama icon not always showing up in photo viewer.
Show old results
Restart loader on attachment cursor updates
Load preview first
Set the scale type for the default image icon
Make sure we check the most up to date text for the token offsets.
Add comments to the recipientedittextview replace code.
Fix crashes associated with new logic to replace entire address with name + address
|
| 4bd6592a9709c6dab7ba46d1b548d83525e3485d |
27-Nov-2012 |
Paul Westbrook <pwestbro@google.com> |
am 18bc55d1: Merge remote-tracking branch \'goog/jb-ub-mail\' into gmailmerge
* commit '18bc55d173000f05b10fd547fd67522abfa95523':
Reduce time until first revision of a chip is drawn.
dont replace the text in the text field when editing a fake or generated entry
Make sure that we take the existng temporary contact, where available.
Make sure that the last "fake entry" chip is correctly committed
Update chips to follow new ux spec for replacement
Reset maxlines when the user expands text
Fix for panorama icon not always showing up in photo viewer.
Show old results
Restart loader on attachment cursor updates
Load preview first
Set the scale type for the default image icon
Make sure we check the most up to date text for the token offsets.
Add comments to the recipientedittextview replace code.
Fix crashes associated with new logic to replace entire address with name + address
|
| 4bfa1dafa1b7cc2ada704c4501a03eea693626f7 |
27-Nov-2012 |
mindyp <mindyp@google.com> |
Make sure we proplerly edit created chips.
We need to edit the created chips before the text is changed so that we
don't count the existing "," when deleting
Also, make sure to move chips that are being edited as text to the end
of the field
Fixes b/7547813 When I try to delect an email address for each charater, it blocks automatically again.
Change-Id: I60661945b75ab0f4ffbb04e71971d16e2900c26c
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 93be01ea0cb2b9871d45d0f1b13a84556b026e8d |
27-Nov-2012 |
mindyp <mindyp@google.com> |
Merge in sms fixes
merges:
https://googleplex-android-review.googlesource.com/#/c/252609/1
Change-Id: I04a0ffa4feb36683f1392ec730742f5f7e10fa32
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 18bc55d173000f05b10fd547fd67522abfa95523 |
20-Nov-2012 |
Paul Westbrook <pwestbro@google.com> |
Merge remote-tracking branch 'goog/jb-ub-mail' into gmailmerge
Conflicts:
chips/src/com/android/ex/chips/RecipientEditTextView.java
Change-Id: I160582b77ead921df187bdcf41a1f53cd0d5e425
|
| a9c047e134d38ce3993bf75588b3c02ad9b11ff3 |
16-Nov-2012 |
Tom Taylor <tomtaylor@google.com> |
am 160a0ef8: am f5ac3286: SMS text messaging omits numbers in parentheses
* commit '160a0ef8b362614c702ee2f9c34318578a91cc00':
SMS text messaging omits numbers in parentheses
|
| 160a0ef8b362614c702ee2f9c34318578a91cc00 |
16-Nov-2012 |
Tom Taylor <tomtaylor@google.com> |
am f5ac3286: SMS text messaging omits numbers in parentheses
* commit 'f5ac32862370c6dd004baa0ac838bced8794a0d8':
SMS text messaging omits numbers in parentheses
|
| f5ac32862370c6dd004baa0ac838bced8794a0d8 |
15-Nov-2012 |
Tom Taylor <tomtaylor@google.com> |
SMS text messaging omits numbers in parentheses
Bug 7355280
Very localized fix. Tweak the phone number matching pattern to handle a
"1" before parens. This change was originally incorporated in MR1, but
wiped out by some automerger change. Bringing the change back for MR1.1.
Change-Id: Ifd11762fb7253fab69ca912dff6b62c5673bf216
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 8027ca533990240d0883163abb17a1b0231a168b |
14-Nov-2012 |
mindyp <mindyp@google.com> |
Remove the unneeded call to "findtokenstart"; we already have the token start
Part of b/7492291 First 2 contacts takes too long to resolve into chips when there are many contacts
and general speed improvements
4ms faster to create a chip
Change-Id: Ib016492cf63aa87ee3ace8e6bb7988fbe0a37749
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| fbe2d2113c0d00e7f7c7197a3727bb0728d220d8 |
14-Nov-2012 |
mindyp <mindyp@google.com> |
Don't validate the recipient text each time
Instead, validate once.
Saves ~10ms per chip creation
Win.
Part of b/7492291 First 2 contacts takes too long to resolve into chips when there are many contacts
and general speed improvements
Change-Id: I6f3da136da23942c8bec25cee7038d475e7005e6
hips/src/com/android/ex/chips/BaseRecipientAdapter.java
hips/src/com/android/ex/chips/RecipientAlternatesAdapter.java
hips/src/com/android/ex/chips/RecipientEditTextView.java
hips/src/com/android/ex/chips/RecipientEntry.java
|
| 99ea997e237f6941bed7bdfbc221ad78643650c5 |
09-Nov-2012 |
mindyp <mindyp@google.com> |
Reduce time until first revision of a chip is drawn.
Means less time showing plain text.
replace call is expensive.
Change-Id: I1be571af78497c2dfff724b612d60ededc98ff36
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| e719fc8a822b3db583f82a6de1b8690267e14d96 |
09-Nov-2012 |
mindyp <mindyp@google.com> |
dont replace the text in the text field when editing a fake or generated entry
We are editing the entire text in there, and that includes the display name
and any other information...so just remove the span
This means we dont trigger a text change that triggers a scroll
Fixes b/7499873 Odd scroll when touch non-contact chips with quote text enabled
Change-Id: I0c537e7fec663abe3cec96a5b59bc52caa009a30
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 9a5bd4040c704812e5b7cc80825f8cc9eec8c37e |
09-Nov-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am e3c6084b: (-s ours) am a34f7115: Reconcile with jb-mr1-release - do not merge
* commit 'e3c6084bba071f07edf90e36ab02e4f2306ce403':
|
| 96f90da26ff4caa0d6b24cbdbca53a893d17635e |
09-Nov-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 3a47ffb4: (-s ours) am 6297b872: Reconcile with jb-mr1-release - do not merge
* commit '3a47ffb453fbb496024d9a311a681b7333dd7004':
|
| e3c6084bba071f07edf90e36ab02e4f2306ce403 |
09-Nov-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am a34f7115: Reconcile with jb-mr1-release - do not merge
* commit 'a34f71153cebf524807767886dad4defc32d8d4d':
|
| 3a47ffb453fbb496024d9a311a681b7333dd7004 |
09-Nov-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 6297b872: Reconcile with jb-mr1-release - do not merge
* commit '6297b872cf131a35b1f6d98f207e08f37e4c9128':
|
| 09b32f3496fdba25eacb813a925d195919de1029 |
09-Nov-2012 |
mindyp <mindyp@google.com> |
am a6292fc0: am 519f7918: am 797b22f9: Merge changes to chips from unbundled branch: update behavior to match new ux spec
* commit 'a6292fc067663f2d5e17db924e595f02299790bc':
Merge changes to chips from unbundled branch: update behavior to match new ux spec
|
| a6292fc067663f2d5e17db924e595f02299790bc |
09-Nov-2012 |
mindyp <mindyp@google.com> |
am 519f7918: am 797b22f9: Merge changes to chips from unbundled branch: update behavior to match new ux spec
* commit '519f7918debdeb7613d86307b0f1ead66797d2a0':
Merge changes to chips from unbundled branch: update behavior to match new ux spec
|
| a34f71153cebf524807767886dad4defc32d8d4d |
08-Nov-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr1-release - do not merge
Change-Id: Ie06c8378e80e9d7c74b6cada9c7cbac06aaa3d20
|
| e4838da97b026b688876152d9ccc4b72e1b125c2 |
08-Nov-2012 |
mindyp <mindyp@google.com> |
am edca3dd4: am d00c91b9: am 06208d07: cherrypick: Reset maxlines when the user expands text
* commit 'edca3dd4e70022782d2b89ff3c631392a868ce9d':
cherrypick: Reset maxlines when the user expands text
|
| edca3dd4e70022782d2b89ff3c631392a868ce9d |
08-Nov-2012 |
mindyp <mindyp@google.com> |
am d00c91b9: am 06208d07: cherrypick: Reset maxlines when the user expands text
* commit 'd00c91b9200ac3dbb2be7103424f8956d4868d36':
cherrypick: Reset maxlines when the user expands text
|
| 1ad9f44796cad21c9d2166c33c3dd8ca3adc41b2 |
07-Nov-2012 |
Doug Zongker <dougz@android.com> |
add exponential backoff option to OperationScheduler
Change-Id: I583f2d628726a3579aba66a49310a0ccffa94c0a
ommon/java/com/android/common/OperationScheduler.java
ommon/tests/src/com/android/common/OperationSchedulerTest.java
|
| 8adb8f081f31911059a96bd426de01a4d3128e1a |
07-Nov-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| 6297b872cf131a35b1f6d98f207e08f37e4c9128 |
07-Nov-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr1-release - do not merge
Change-Id: Ib03c9a05d1f9d755dea8c93beb270b1eae04ea0b
|
| 439fbcab0c89d669486e998d30e5c73613784d01 |
07-Nov-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| 519f7918debdeb7613d86307b0f1ead66797d2a0 |
07-Nov-2012 |
mindyp <mindyp@google.com> |
am 797b22f9: Merge changes to chips from unbundled branch: update behavior to match new ux spec
* commit '797b22f945b65ecebbf86e45265f9403f6ff257c':
Merge changes to chips from unbundled branch: update behavior to match new ux spec
|
| d00c91b9200ac3dbb2be7103424f8956d4868d36 |
07-Nov-2012 |
mindyp <mindyp@google.com> |
am 06208d07: cherrypick: Reset maxlines when the user expands text
* commit '06208d075bdc260410847806300fd5fcd8c43b49':
cherrypick: Reset maxlines when the user expands text
|
| 797b22f945b65ecebbf86e45265f9403f6ff257c |
07-Nov-2012 |
mindyp <mindyp@google.com> |
Merge changes to chips from unbundled branch: update behavior to match new ux spec
Fixes part of b/7481045 recipient address briefly drawn w/o friendly name
Change-Id: I523b960fd044f054ec32befc10599d4d0e485eaf
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| bc8820f28fae94349e41ad09e166b0537ddd1377 |
07-Nov-2012 |
mindyp <mindyp@google.com> |
Make sure that we take the existng temporary contact, where available.
Temporary contact entry will give us display name and address if it has it
when there is no contact match
Fixes part of b/7481045 recipient address briefly drawn w/o friendly name
Change-Id: Id5cf6b770d1179c81d9c9b808af4681e632d18a7
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| dab17fcff4efe640287a8cce7f82bd305e2c1fcf |
07-Nov-2012 |
mindyp <mindyp@google.com> |
Make sure that the last "fake entry" chip is correctly committed
Fix logic to correctly determine that this "recipient chip" is really
text
Fixes part of b/7481045 recipient address briefly drawn w/o friendly name
Change-Id: I4c5244581a4fce5de58d6d9c510e1df16674c338
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| d5f7739013e4e4e392bcfca04c0cf1ed07c04819 |
06-Nov-2012 |
mindyp <mindyp@google.com> |
Update chips to follow new ux spec for replacement
Part of b/7481045 recipient address briefly drawn w/o friendly name
Change-Id: I2f3c63f555143c66b3d4f466b60e0ca884d6302b
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 06208d075bdc260410847806300fd5fcd8c43b49 |
06-Nov-2012 |
mindyp <mindyp@google.com> |
cherrypick: Reset maxlines when the user expands text
To avoid an initial jump when changing over a possibly large numbers of contacts to chips,
start with maxlines of 2 from some apps, and eliminate this when the user chooses to expand.
Part of b/7481045 recipient address briefly drawn w/o friendly name
Change-Id: I5c8cd5c1569befa28a67ddb1f4153e03e896c25a
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| f5968cf80668aec6d372fcea0b04f741a77967be |
06-Nov-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 08d75980: (-s ours) am 7af7b654: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '08d75980adbf9af525f844ef04d802ef63c79cc7':
|
| 08d75980adbf9af525f844ef04d802ef63c79cc7 |
06-Nov-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 7af7b654: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '7af7b6548d1a3090daf621a690cc214eff4c253d':
|
| 7af7b6548d1a3090daf621a690cc214eff4c253d |
06-Nov-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: I5a840e438bae2f51286a4596060a1021215182cb
|
| c270a161307eeeee3aac5f5ef91424fbe25ce1e9 |
06-Nov-2012 |
mindyp <mindyp@google.com> |
Reset maxlines when the user expands text
To avoid an initial jump when changing over a possibly large numbers of contacts to chips,
start with maxlines of 2 from some apps, and eliminate this when the user chooses to expand.
Part of b/7481045 recipient address briefly drawn w/o friendly name
Change-Id: I5c8cd5c1569befa28a67ddb1f4153e03e896c25a
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 4a37b499395fdbc803db11e7fd3d98ed3f047b22 |
31-Oct-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am f4ec2c66: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit 'f4ec2c66f92498c80dd5e9c85163215892b8d993':
Show old results
|
| f4ec2c66f92498c80dd5e9c85163215892b8d993 |
31-Oct-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: I07d9b3314cf10da7c665babd6f15e196a74829c7
|
| 9dd5598ae90b252377fef14106436a73a868d29e |
30-Oct-2012 |
Mark Wei <markwei@google.com> |
resolved conflicts for merge of 28ed566a to master
Change-Id: I7b97bf6ddb01e8bbc059708889a4dc30efe6c8e9
|
| 7c21e19482274e618c7a1457ba5d7f4bfab614b0 |
30-Oct-2012 |
Paul Westbrook <pwestbro@google.com> |
am a27fb71f: (-s ours) am 939ce1b0: Restart loader on attachment cursor updates
* commit 'a27fb71f92f323b5d693942d219f66b886fad6e7':
Restart loader on attachment cursor updates
|
| 28ed566a7471cbd36c70bc9568840dd555dc64c3 |
29-Oct-2012 |
Mark Wei <markwei@google.com> |
am 5f0470b2: Fix for panorama icon not always showing up in photo viewer.
* commit '5f0470b259c56dd5df171948d6efd4219a3a17f8':
Fix for panorama icon not always showing up in photo viewer.
|
| a27fb71f92f323b5d693942d219f66b886fad6e7 |
29-Oct-2012 |
Paul Westbrook <pwestbro@google.com> |
am 939ce1b0: Restart loader on attachment cursor updates
* commit '939ce1b0bcd1ded7e1dc8c36eb89dcd4d891bd12':
Restart loader on attachment cursor updates
|
| b6d089e3b6724b81ecb65b0b74c92595b4c1af23 |
29-Oct-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| 5f0470b259c56dd5df171948d6efd4219a3a17f8 |
25-Oct-2012 |
Mark Wei <markwei@google.com> |
Fix for panorama icon not always showing up in photo viewer.
cherry-pick of https://googleplex-android-review.googlesource.com/#/c/246161/
Bug: 7392422
Change-Id: Ifff054c86366eb0b495a06ead9e0dc60123e90c4
hotoviewer/src/com/android/ex/photo/PhotoViewActivity.java
hotoviewer/src/com/android/ex/photo/fragments/PhotoViewFragment.java
|
| 939ce1b0bcd1ded7e1dc8c36eb89dcd4d891bd12 |
24-Oct-2012 |
Paul Westbrook <pwestbro@google.com> |
Restart loader on attachment cursor updates
cherry-pick of https://googleplex-android-review.googlesource.com/#/c/245483/
Bug: 7403076
Change-Id: I620403db9f7304e99ca4e9c0c58a439e277225d0
hotoviewer/src/com/android/ex/photo/fragments/PhotoViewFragment.java
|
| ec728213957a68b8ba424cba4ca715f465bf561c |
25-Oct-2012 |
Paul Westbrook <pwestbro@google.com> |
Show old results
Keep showing old recipient results when no local results are returned,
if we are waiting for server results
cherry-pick of https://googleplex-android-review.googlesource.com/#/c/246005/
Bug: 7407129
Change-Id: If495ff6437da064206923dc95ee61b7a4f19c2f3
hips/src/com/android/ex/chips/BaseRecipientAdapter.java
|
| a1bdcf1af2c39a0d8b0d0fb8f32ea43a70aed17f |
25-Oct-2012 |
Mark Wei <markwei@google.com> |
Fix for panorama icon not always showing up in photo viewer.
Bug: 7392422
Change-Id: Ifff054c86366eb0b495a06ead9e0dc60123e90c4
hotoviewer/src/com/android/ex/photo/PhotoViewActivity.java
hotoviewer/src/com/android/ex/photo/fragments/PhotoViewFragment.java
|
| 3aa5c9ccdf7384380d1a1603211a8b4a6fffb9a6 |
25-Oct-2012 |
Paul Westbrook <pwestbro@google.com> |
am f70a5e84: am 690abee6: Show old results
* commit 'f70a5e84bcd944b46f1621144f50f83c7eb26215':
Show old results
|
| f70a5e84bcd944b46f1621144f50f83c7eb26215 |
25-Oct-2012 |
Paul Westbrook <pwestbro@google.com> |
am 690abee6: Show old results
* commit '690abee69959184f0525e7d4ea2630926e66055f':
Show old results
|
| 690abee69959184f0525e7d4ea2630926e66055f |
25-Oct-2012 |
Paul Westbrook <pwestbro@google.com> |
Show old results
Keep showing old recipient results when no local results are returned,
if we are waiting for server results
cherry-pick of https://googleplex-android-review.googlesource.com/#/c/246005/
Bug: 7407129
Change-Id: If495ff6437da064206923dc95ee61b7a4f19c2f3
hips/src/com/android/ex/chips/BaseRecipientAdapter.java
|
| 48a26c9dcf012645315a0b77c687f57476d452a0 |
25-Oct-2012 |
Paul Westbrook <pwestbro@google.com> |
Show old results
Keep showing old recipient results when no local results are returned,
if we are waiting for server results
Bug: 7407129
Change-Id: If495ff6437da064206923dc95ee61b7a4f19c2f3
hips/src/com/android/ex/chips/BaseRecipientAdapter.java
|
| b1b8fc2577d8ce9493608056cef6a725437a5ef2 |
24-Oct-2012 |
Paul Westbrook <pwestbro@google.com> |
Restart loader on attachment cursor updates
Bug: 7403076
Change-Id: I620403db9f7304e99ca4e9c0c58a439e277225d0
hotoviewer/src/com/android/ex/photo/fragments/PhotoViewFragment.java
|
| a6bacbea548c115599e27a0100e027f51fb4145b |
17-Oct-2012 |
Martin Hibdon <mhibdon@google.com> |
Allow PhotoViewActivity to choose inital photo by uri
This ensures that the correct photo will be displayed even
if the contents of the cursor changes between the time
the activity is launched and the cursor gets loaded.
Change-Id: I5f00ebde072587929f01e34c8b4b84e5eb0e9bd3
hotoviewer/src/com/android/ex/photo/Intents.java
hotoviewer/src/com/android/ex/photo/PhotoViewActivity.java
|
| 843063cc8516a01a56a252a55613199b23e21582 |
17-Oct-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| 022e7fb24f9faf30608e3f16bdaadba05be3f136 |
16-Oct-2012 |
Tom Taylor <tomtaylor@google.com> |
am 0453ec9b: am b32dd40a: SMS text messaging omits numbers in parentheses
* commit '0453ec9b61f1c416c8a79e401f9d3358bef2c59f':
SMS text messaging omits numbers in parentheses
|
| 0453ec9b61f1c416c8a79e401f9d3358bef2c59f |
16-Oct-2012 |
Tom Taylor <tomtaylor@google.com> |
am b32dd40a: SMS text messaging omits numbers in parentheses
* commit 'b32dd40aaa11a850f2ed273dd55bf25cea5d7b9d':
SMS text messaging omits numbers in parentheses
|
| b32dd40aaa11a850f2ed273dd55bf25cea5d7b9d |
16-Oct-2012 |
Tom Taylor <tomtaylor@google.com> |
SMS text messaging omits numbers in parentheses
Bug 7355280
Very localized fix. Tweak the phone number matching pattern to handle a
"1" before parens.
Change-Id: I67d878145fbc0b0ac17197043ea84f68e52b8156
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 09a864a0f316dd3f4b249f0e03deff5745a693dd |
15-Oct-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
|
| 74ee30d2f0191e74c29c2cafc970ed286c27ec6c |
15-Oct-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 5788646d: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '5788646d57c764d16e38b46b0eff15358989be26':
|
| 5788646d57c764d16e38b46b0eff15358989be26 |
15-Oct-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: I312e1f2eefcdb6378d1dfbcdde2ed26d8a2da6b4
|
| cfe83324943c8f5c4aabd8293700387481d6f3e3 |
14-Oct-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| d520012075a697fffdbcc488e1705f9c3aab1d16 |
14-Oct-2012 |
Paul Westbrook <pwestbro@google.com> |
am e209312c: (-s ours) am 14a4df6f: Load preview first
* commit 'e209312c5f2784bf746c24e7708b76b9f2e69b7f':
Load preview first
|
| e209312c5f2784bf746c24e7708b76b9f2e69b7f |
14-Oct-2012 |
Paul Westbrook <pwestbro@google.com> |
am 14a4df6f: Load preview first
* commit '14a4df6f91f3563ab956ed1730bdbf4e6976e5cd':
Load preview first
|
| 14a4df6f91f3563ab956ed1730bdbf4e6976e5cd |
13-Oct-2012 |
Paul Westbrook <pwestbro@google.com> |
Load preview first
If the preview is available, load the it first, while
waiting for the full size image to load
Cherry-pick of https://googleplex-android-review.googlesource.com/#/c/238893/
Bug: 7340082
Bug: 7298245
Change-Id: I64934001d832844a776f8d9c1f2abcece552f79c
hotoviewer/src/com/android/ex/photo/fragments/PhotoViewFragment.java
|
| 28c2b3bde4084af90a4951b27f5570a7fe7c5fa9 |
13-Oct-2012 |
Paul Westbrook <pwestbro@google.com> |
Load preview first
If the preview is available, load the it first, while
waiting for the full size image to load
Bug: 7340082
Bug: 7298245
Change-Id: I64934001d832844a776f8d9c1f2abcece552f79c
hotoviewer/src/com/android/ex/photo/fragments/PhotoViewFragment.java
|
| ad8b3bf02c68e36aefe8fde138d715e6cd235812 |
13-Oct-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
|
| f8f0dfa760a303578cd9ee34455503374eef6d7c |
13-Oct-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| 166142615a6d375740946b7d12be1c03f05d0862 |
12-Oct-2012 |
Paul Westbrook <pwestbro@google.com> |
am 777cea29: (-s ours) am da4cfeec: Set the scale type for the default image icon
* commit '777cea29262e48549295c3c028098edc1f90eeeb':
Set the scale type for the default image icon
|
| 777cea29262e48549295c3c028098edc1f90eeeb |
12-Oct-2012 |
Paul Westbrook <pwestbro@google.com> |
am da4cfeec: Set the scale type for the default image icon
* commit 'da4cfeec8ee8863089da547a643393ab3520f5d8':
Set the scale type for the default image icon
|
| da4cfeec8ee8863089da547a643393ab3520f5d8 |
12-Oct-2012 |
Paul Westbrook <pwestbro@google.com> |
Set the scale type for the default image icon
By setting the scale type to center, the default icon
is not scaled up.
cherry-pick of https://googleplex-android-review.googlesource.com/#/c/238674/
Bug: 7298245
Bug: 7340457
Change-Id: I66200a1c751ca80e878e55a7b9daa656a6cbe98d
hotoviewer/src/com/android/ex/photo/fragments/PhotoViewFragment.java
|
| 917f53e9762be3c8b2eafa58cf6ab825d2cc9c9e |
12-Oct-2012 |
Paul Westbrook <pwestbro@google.com> |
Set the scale type for the default image icon
By setting the scale type to center, the default icon
is not scaled up.
Bug: 7298245
Bug: 7340457
Change-Id: I66200a1c751ca80e878e55a7b9daa656a6cbe98d
hotoviewer/src/com/android/ex/photo/fragments/PhotoViewFragment.java
|
| 1fe8048d569b1b6c61b3cba22bfca33c945417c7 |
05-Oct-2012 |
Adam Copp <adamcopp@google.com> |
Merge "Temporary fix for image viewer crash"
|
| faa985bd481187ed6f569509f65e1f34a6e0b65e |
05-Oct-2012 |
Adam Copp <adamcopp@google.com> |
Temporary fix for image viewer crash
This fixes a bug causing the app to crash when we can't open a stream to
a url when we download an image.
Bug: 7294701
Change-Id: Ifd0c62c3f5bb6a168e2e2932734fa448ffb9344c
hotoviewer/src/com/android/ex/photo/util/ImageUtils.java
|
| cb27b906d20972361ef15a308a1d1546ecfb4dc3 |
04-Oct-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 4c9dbbf9: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '4c9dbbf9378b70c4011817eb1f8696c43f05b4b0':
|
| 4c9dbbf9378b70c4011817eb1f8696c43f05b4b0 |
04-Oct-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr1-release - do not merge
Change-Id: I0075dec8bd1735d3db582cc242e8d8b7157813be
|
| d44d191946eea96b4247e9039735158887adba96 |
04-Oct-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| 8ff20482cac4c76aa1bd55f5023d444485ff9635 |
04-Oct-2012 |
mindyp <mindyp@google.com> |
am 63414f62: am c16fb2a3: cherrypick: Make sure we check the most up to date text for the token offsets.
* commit '63414f62379b45a14eac7bc6bf9c264b4b4c2c3d':
cherrypick: Make sure we check the most up to date text for the token offsets.
|
| 63414f62379b45a14eac7bc6bf9c264b4b4c2c3d |
04-Oct-2012 |
mindyp <mindyp@google.com> |
am c16fb2a3: cherrypick: Make sure we check the most up to date text for the token offsets.
* commit 'c16fb2a3bcc168fb69a92f43aebf6cfa4bf3a007':
cherrypick: Make sure we check the most up to date text for the token offsets.
|
| c16fb2a3bcc168fb69a92f43aebf6cfa4bf3a007 |
03-Oct-2012 |
mindyp <mindyp@google.com> |
cherrypick: Make sure we check the most up to date text for the token offsets.
The issue here was that we were using the old version of the editable string
(cached in var text) to look for the start/end of tokens, but the result
of calling commitChip may have updated the text (added corrective rfc822
formatting, or a display name)
Fixes b/7268603 [Manta] List of email addresses pasted into the To field is broken
Change-Id: Iccc8dbf78a018c84fd818582d10ff2b02a787276
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 17c922958f2a9bad8b22675e7daf9b40bf6ef2ce |
03-Oct-2012 |
mindyp <mindyp@google.com> |
Make sure we check the most up to date text for the token offsets.
The issue here was that we were using the old version of the editable string
(cached in var text) to look for the start/end of tokens, but the result
of calling commitChip may have updated the text (added corrective rfc822
formatting, or a display name)
Fixes b/7268603 [Manta] List of email addresses pasted into the To field is broken
Change-Id: Iccc8dbf78a018c84fd818582d10ff2b02a787276
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| da165c2e30ec1040419cded96a6248ccfe303a94 |
02-Oct-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am c2ff4e6d: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit 'c2ff4e6dac63a30c7e0b99e00f577acef84f0534':
|
| c2ff4e6dac63a30c7e0b99e00f577acef84f0534 |
02-Oct-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr1-release - do not merge
Change-Id: Ia2ad0f4540780e5a2c68f4b9773ffd1942228d93
|
| fcf5557b421e4d2561bbc4fdf56f237171313d8d |
02-Oct-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| dbbc26c3b1bcdf9a2642c2334fc62b79d82e96bc |
01-Oct-2012 |
mindyp <mindyp@google.com> |
am b2d148b8: am 0c6fe7e6: cherrypick: Fix crashes associated with new logic to replace entire address with name + address
* commit 'b2d148b8624df5f56e976cad38e1812f5fa674be':
cherrypick: Fix crashes associated with new logic to replace entire address with name + address
|
| b2d148b8624df5f56e976cad38e1812f5fa674be |
01-Oct-2012 |
mindyp <mindyp@google.com> |
am 0c6fe7e6: cherrypick: Fix crashes associated with new logic to replace entire address with name + address
* commit '0c6fe7e60e7550e56ad1982d0d5833b64eea6f97':
cherrypick: Fix crashes associated with new logic to replace entire address with name + address
|
| afca3691912c1986f4ef2dae3c2187340c1c19c1 |
01-Oct-2012 |
mindyp <mindyp@google.com> |
Add comments to the recipientedittextview replace code.
makes it easier for others to debug/ review
Change-Id: Icdcbaa9074c81ef33943b24e8e0b544513360d8a
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 0c6fe7e60e7550e56ad1982d0d5833b64eea6f97 |
29-Sep-2012 |
mindyp <mindyp@google.com> |
cherrypick: Fix crashes associated with new logic to replace entire address with name + address
Fixes b/7257614 crash when replying to a message
Change-Id: I6dcda376073f941fba4b09a647bdb00a92e4ccce
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| d5f17a870bd131c4c1a8e4731671a6980b6bcbf6 |
29-Sep-2012 |
mindyp <mindyp@google.com> |
Fix crashes associated with new logic to replace entire address with name + address
Fixes b/7257614 crash when replying to a message
Change-Id: I6dcda376073f941fba4b09a647bdb00a92e4ccce
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| dd700a6b32a25697e3adf209027f3cba91eb45f2 |
26-Sep-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am c930ef0a: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit 'c930ef0a3ed04ef8eed499e4146a1cb09c2443a4':
|
| c930ef0a3ed04ef8eed499e4146a1cb09c2443a4 |
26-Sep-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr1-release - do not merge
Change-Id: I30293e9406cfeb72eb1d83cdf39e4ec60f35744c
|
| 99f7f4fc378c3ba2bc00c4beb0cfba02577a1bca |
26-Sep-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| c9b630897777a40519a618f588c1d3d5b2d13d28 |
26-Sep-2012 |
mindyp <mindyp@google.com> |
am e16e5a89: am 3817205e: am 215b1c80: The "original text" is just what we are putting in the text view, which is displaytext
* commit 'e16e5a89a0807299cf1464e225d10adb1d277318':
The "original text" is just what we are putting in the text view, which is displaytext
|
| e16e5a89a0807299cf1464e225d10adb1d277318 |
26-Sep-2012 |
mindyp <mindyp@google.com> |
am 3817205e: am 215b1c80: The "original text" is just what we are putting in the text view, which is displaytext
* commit '3817205ea94886f05f026b25c61e30288dd3fb8b':
The "original text" is just what we are putting in the text view, which is displaytext
|
| 3817205ea94886f05f026b25c61e30288dd3fb8b |
26-Sep-2012 |
mindyp <mindyp@google.com> |
am 215b1c80: The "original text" is just what we are putting in the text view, which is displaytext
* commit '215b1c80111ccc8d42256fa8f38f3d00e0171cf2':
The "original text" is just what we are putting in the text view, which is displaytext
|
| 215b1c80111ccc8d42256fa8f38f3d00e0171cf2 |
26-Sep-2012 |
mindyp <mindyp@google.com> |
The "original text" is just what we are putting in the text view, which is displaytext
Fixes b/7233276 Crash at clicking Email - ReplyAll on Manta
Change-Id: Icd5e2c0c2afb625a6b181592b2da27a008266a33
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 508667e1bc23d18190c979799611a1927010cd01 |
26-Sep-2012 |
Paul Westbrook <pwestbro@google.com> |
resolved conflicts for merge of b3f0f056 to master
Change-Id: I5def1804466ff971ed5bc5afd2a2d68e135d20a2
|
| b3f0f056afba01a3d63ffc3bc27981a045c57672 |
25-Sep-2012 |
Paul Westbrook <pwestbro@google.com> |
am 3a539a30: am 5211e468: Add Exif parser
* commit '3a539a30189f03c60019a976bd4b9095eec15208':
Add Exif parser
|
| 3a539a30189f03c60019a976bd4b9095eec15208 |
25-Sep-2012 |
Paul Westbrook <pwestbro@google.com> |
am 5211e468: Add Exif parser
* commit '5211e4682a26be787e60b1c56f56b113a2fac26c':
Add Exif parser
|
| 0df9c051b6b6023d376f112ea6902951008ad4b5 |
25-Sep-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| 5211e4682a26be787e60b1c56f56b113a2fac26c |
20-Sep-2012 |
Paul Westbrook <pwestbro@google.com> |
Add Exif parser
Class to parse exif headers of images to detect orientation
Modify ImageUtils#decodeStream to parse the exif header and respect
orientation
Bug: 7087307
Change-Id: I93c3a69a50ae26d3fd4e96944439f87e9d511945
hotoviewer/src/com/android/ex/photo/util/Exif.java
hotoviewer/src/com/android/ex/photo/util/ImageUtils.java
|
| ef8d37e8cef5ba8f349baef79abf9510d86b4dd1 |
24-Sep-2012 |
mindyp <mindyp@google.com> |
am 6c06fb23: am 65a0f024: am b6641931: Make sure when we reverse lookup a recipient, we replace the underlying text string as well.
* commit '6c06fb23e6c14643e1e0bd13eb4e9ead685c769e':
Make sure when we reverse lookup a recipient, we replace the underlying text string as well.
|
| 6c06fb23e6c14643e1e0bd13eb4e9ead685c769e |
24-Sep-2012 |
mindyp <mindyp@google.com> |
am 65a0f024: am b6641931: Make sure when we reverse lookup a recipient, we replace the underlying text string as well.
* commit '65a0f02472df7c28f356822993142f6fff3eacc4':
Make sure when we reverse lookup a recipient, we replace the underlying text string as well.
|
| 65a0f02472df7c28f356822993142f6fff3eacc4 |
24-Sep-2012 |
mindyp <mindyp@google.com> |
am b6641931: Make sure when we reverse lookup a recipient, we replace the underlying text string as well.
* commit 'b6641931653e19766025820fb78c7142e597545e':
Make sure when we reverse lookup a recipient, we replace the underlying text string as well.
|
| b6641931653e19766025820fb78c7142e597545e |
24-Sep-2012 |
mindyp <mindyp@google.com> |
Make sure when we reverse lookup a recipient, we replace the underlying text string as well.
Fixes b/7146034 Conversation message header doesn't show friendly names
Change-Id: I043d352e1c6546e5a8c07854e832f31c3a71d24d
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| a1d5bc739936a5c8b7167d130d737b88a5cca79b |
24-Sep-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am e5913938: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit 'e5913938bb99f1efb6cd49d29b67362e5833e086':
|
| e5913938bb99f1efb6cd49d29b67362e5833e086 |
24-Sep-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr1-release - do not merge
Change-Id: I23eff659df50eda339492319a1d92c11558f34a4
|
| 0440138687e29896ee227d7902d914958efd0b10 |
22-Sep-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| 0abf6f3aba2cd790de84e16fcc661e16b62cee00 |
21-Sep-2012 |
Paul Westbrook <pwestbro@google.com> |
am 29c041a3: am 88d18b9f: am 4054bd6d: Use gesture detector from support lib
* commit '29c041a3e41b93c7ffd8f29550df501f0b45ea02':
Use gesture detector from support lib
|
| 29c041a3e41b93c7ffd8f29550df501f0b45ea02 |
21-Sep-2012 |
Paul Westbrook <pwestbro@google.com> |
am 88d18b9f: am 4054bd6d: Use gesture detector from support lib
* commit '88d18b9f331bcc39602fb4d883a88d9edd4ffa26':
Use gesture detector from support lib
|
| 88d18b9f331bcc39602fb4d883a88d9edd4ffa26 |
21-Sep-2012 |
Paul Westbrook <pwestbro@google.com> |
am 4054bd6d: Use gesture detector from support lib
* commit '4054bd6d6c5d51d9492184b1881253c223ddbf7d':
Use gesture detector from support lib
|
| 4054bd6d6c5d51d9492184b1881253c223ddbf7d |
21-Sep-2012 |
Paul Westbrook <pwestbro@google.com> |
Use gesture detector from support lib
Bug: 7206080
Change-Id: I9b5d332d095335f13b61c9c9ccd8152a462a9eb5
hotoviewer/src/com/android/ex/photo/views/GestureDetector.java
hotoviewer/src/com/android/ex/photo/views/PhotoView.java
|
| e02a7d708f11c3fe213d17a886eebe1131cd77f3 |
21-Sep-2012 |
Adam Copp <adamcopp@google.com> |
Merge "Add option to permenantly show ProgressBar"
|
| a0646d0f8e6f597bc6da6ae1fc15909eb2afdacf |
20-Sep-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am b060fe28: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit 'b060fe28670601e6885f6375a9c06124a5be7389':
|
| b060fe28670601e6885f6375a9c06124a5be7389 |
20-Sep-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr1-release - do not merge
Change-Id: I91685494ac99ec33117c8643bb303975b10add89
|
| 01007eb766b9fbc18116b401d5d1c086e6f5515d |
20-Sep-2012 |
Mark Wei <markwei@google.com> |
am 05783789: am da78c1dc: am c907eecd: Prevent NPE while viewing photo from attachment.
* commit '057837890de13cc9fd6909f4c4a69abec388a34d':
Prevent NPE while viewing photo from attachment.
|
| efc5b69e23363df079da8cdfb4829afe0238f863 |
20-Sep-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| 057837890de13cc9fd6909f4c4a69abec388a34d |
20-Sep-2012 |
Mark Wei <markwei@google.com> |
am da78c1dc: am c907eecd: Prevent NPE while viewing photo from attachment.
* commit 'da78c1dc07cd36e04c98f1d468b45766f1e0e0c6':
Prevent NPE while viewing photo from attachment.
|
| 5b5c48652859e1ba79542f59f94398f18e76ca30 |
13-Sep-2012 |
Adam Copp <adamcopp@google.com> |
Add option to permenantly show ProgressBar
In order to indicate to the user that more content is loading, the
provider can provide an image with the loading field set and null as it's
url. In this case, we will not try loading any image, and will just show the
ProgressBar.
Something like this is nessecary in Velvet, where we wish to load
infinite images.
Change-Id: Ib26412a579abdbe7fbd338b99ff39f4d1c13f806
hotoviewer/src/com/android/ex/photo/adapters/BaseCursorPagerAdapter.java
hotoviewer/src/com/android/ex/photo/adapters/PhotoPagerAdapter.java
hotoviewer/src/com/android/ex/photo/fragments/PhotoViewFragment.java
hotoviewer/src/com/android/ex/photo/provider/PhotoContract.java
hotoviewer/src/com/android/ex/photo/util/ImageUtils.java
|
| a8141795acc5fce10d992d398b7782be38a4426b |
20-Sep-2012 |
Adam Copp <adamcopp@google.com> |
Merge "Cursor listeners can use setPhotoIndex meaningfully"
|
| da78c1dc07cd36e04c98f1d468b45766f1e0e0c6 |
20-Sep-2012 |
Mark Wei <markwei@google.com> |
am c907eecd: Prevent NPE while viewing photo from attachment.
* commit 'c907eecdbdf8a2b85280f27f636c332f3a0fa699':
Prevent NPE while viewing photo from attachment.
|
| 11a93227f5e0a627349a73a9c3472700e40618f1 |
19-Sep-2012 |
Adam Copp <adamcopp@google.com> |
Merge "Specify minimum SDK version of 11 in the manifest"
|
| b590c0fa48cee3a2d6e465c29982073369922611 |
19-Sep-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| d0c577cfed4ce141ce26552c57b7b60a495a437d |
19-Sep-2012 |
Adam Copp <adamcopp@google.com> |
Specify minimum SDK version of 11 in the manifest
The photoviewer project throws errors in eclipse because there's no
minimum sdk version in the AndroidManifest. This CL specifies min SDK
version of 11, which is sufficient for all of the calls we make in the
app and stops eclipse from complaining
Change-Id: Id5492651faa8fffc857d2660f7d4796428efb2d6
hotoviewer/AndroidManifest.xml
|
| 0b0df704f2214cb589643d9d075396eadd0f77e5 |
19-Sep-2012 |
Adam Copp <adamcopp@google.com> |
Cursor listeners can use setPhotoIndex meaningfully
Cursor listeners can now use setPhotoIndex and have the changes take
effect immediately. It appears that nobody in code search will have
their code broken by this change.
Change-Id: I76afd8545310c24f05307d38ed03081914a17987
hotoviewer/src/com/android/ex/photo/PhotoViewActivity.java
|
| c907eecdbdf8a2b85280f27f636c332f3a0fa699 |
19-Sep-2012 |
Mark Wei <markwei@google.com> |
Prevent NPE while viewing photo from attachment.
Bug: 7189283
Change-Id: Ibcb98ae13cf801a6934e0ed4efb4c5349678dcce
hotoviewer/src/com/android/ex/photo/fragments/PhotoViewFragment.java
|
| a300b60cedfde2dc1e60ad3c677a89c4fcfc711c |
19-Sep-2012 |
Paul Westbrook <pwestbro@google.com> |
am dd2a57c4: am d9904217: am bd64181d: Integrate copy of GestureDetector into photoviewer
* commit 'dd2a57c446c05fe7cd8453bc249f38c03d2ab299':
Integrate copy of GestureDetector into photoviewer
|
| dd2a57c446c05fe7cd8453bc249f38c03d2ab299 |
19-Sep-2012 |
Paul Westbrook <pwestbro@google.com> |
am d9904217: am bd64181d: Integrate copy of GestureDetector into photoviewer
* commit 'd9904217dcad3ec8974c50e58b4bba11d38ee2c3':
Integrate copy of GestureDetector into photoviewer
|
| d9904217dcad3ec8974c50e58b4bba11d38ee2c3 |
19-Sep-2012 |
Paul Westbrook <pwestbro@google.com> |
am bd64181d: Integrate copy of GestureDetector into photoviewer
* commit 'bd64181d797dabd8b346b97ebb3e4083e53b864d':
Integrate copy of GestureDetector into photoviewer
|
| 312783dacd438c956fbde8ff51f0265def23b70d |
18-Sep-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| bd64181d797dabd8b346b97ebb3e4083e53b864d |
18-Sep-2012 |
Paul Westbrook <pwestbro@google.com> |
Integrate copy of GestureDetector into photoviewer
This allows the MR0/1 behavior to be used when Email/Gmail is
running on older versions of the platform
Change-Id: I1936d36ddb9f09a3b48d38c2ad44e70ac002fbda
hotoviewer/src/com/android/ex/photo/views/GestureDetector.java
hotoviewer/src/com/android/ex/photo/views/PhotoView.java
|
| 4b9da5a72ee62d47fea8372aa493de0dd6f68250 |
17-Sep-2012 |
Mark Wei <markwei@google.com> |
am 34672da4: am 4030071b: am 697c046e: Prevent NPE in Gmail while viewing photo from attachment
* commit '34672da452ddf07347d2e9fc02f6d66c954ebba3':
Prevent NPE in Gmail while viewing photo from attachment
|
| 34672da452ddf07347d2e9fc02f6d66c954ebba3 |
17-Sep-2012 |
Mark Wei <markwei@google.com> |
am 4030071b: am 697c046e: Prevent NPE in Gmail while viewing photo from attachment
* commit '4030071b710ac64ff4f98b1fdead84dda848331d':
Prevent NPE in Gmail while viewing photo from attachment
|
| 4030071b710ac64ff4f98b1fdead84dda848331d |
17-Sep-2012 |
Mark Wei <markwei@google.com> |
am 697c046e: Prevent NPE in Gmail while viewing photo from attachment
* commit '697c046e3f0632f698d269423b62bb53a7d37a32':
Prevent NPE in Gmail while viewing photo from attachment
|
| 697c046e3f0632f698d269423b62bb53a7d37a32 |
17-Sep-2012 |
Mark Wei <markwei@google.com> |
Prevent NPE in Gmail while viewing photo from attachment
Bug: 7174197
Change-Id: I29ca226b5134888dbe3488f859d9790fe1388984
hotoviewer/src/com/android/ex/photo/fragments/PhotoViewFragment.java
|
| 685658bb07dc786536e038060fdeec975aa62176 |
14-Sep-2012 |
Adam Copp <adamcopp@google.com> |
Merge "Do not show loading bar after thumbnail has loaded"
|
| ebd44ab0a113bc05ef7b8a90dd245327c30f710a |
13-Sep-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 6399bdbe: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '6399bdbedf755308e43cafb1320d41d5dca2e63f':
|
| 6399bdbedf755308e43cafb1320d41d5dca2e63f |
12-Sep-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr1-release - do not merge
Change-Id: I65bf341315fb73f8cf0d74d6ef31444e929b2929
|
| 04e714257e8d6da434cb2d23feab365d38d05273 |
11-Sep-2012 |
Adam Copp <adamcopp@google.com> |
Do not show loading bar after thumbnail has loaded
After talking to the designers for Google Now, who have said they talked
to the designers from gallery app, it appears that we should not show
the loading spinner once the thumbnail has loaded.
Let me know if this is orthogonal to the behaviour you would like in the
gmail app, and I can write a more involved patch with an overridable
callback to decide wether to show the spinner or not.
Change-Id: I77a3f2e2487d469ab47e45c7a94942f831528d41
hotoviewer/src/com/android/ex/photo/fragments/PhotoViewFragment.java
|
| f7d8d3f57d227f4754dcf5be1ab50c878f729f88 |
11-Sep-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| 901a99184f28d259921a9436a1a790dbd1af7098 |
11-Sep-2012 |
mindyp <mindyp@google.com> |
am 5193e0d5: am 7ef1f6e9: am 6c668476: We add the separator ourselves later if it wasnt specified in append.
* commit '5193e0d5c75d1658b754dffd86ec971c3565ae1a':
We add the separator ourselves later if it wasnt specified in append.
|
| 956b67400292cc3dffdbb92e368a6abc1e1275d7 |
11-Sep-2012 |
mindyp <mindyp@google.com> |
am 75d7b96a: am 168c2840: am 3aa118e7: Be extra careful with commas in recipient chips
* commit '75d7b96a5821a71567816be81666e7fd6e97ef0f':
Be extra careful with commas in recipient chips
|
| 5193e0d5c75d1658b754dffd86ec971c3565ae1a |
11-Sep-2012 |
mindyp <mindyp@google.com> |
am 7ef1f6e9: am 6c668476: We add the separator ourselves later if it wasnt specified in append.
* commit '7ef1f6e93f3a8267dcfc32d0ab48e57498f9dc3b':
We add the separator ourselves later if it wasnt specified in append.
|
| 7ef1f6e93f3a8267dcfc32d0ab48e57498f9dc3b |
11-Sep-2012 |
mindyp <mindyp@google.com> |
am 6c668476: We add the separator ourselves later if it wasnt specified in append.
* commit '6c66847624945b3caca9607c61669f4766e7f39e':
We add the separator ourselves later if it wasnt specified in append.
|
| 6c66847624945b3caca9607c61669f4766e7f39e |
11-Sep-2012 |
mindyp <mindyp@google.com> |
We add the separator ourselves later if it wasnt specified in append.
Fixes b/7137725 Attendees are lost after editing
Change-Id: I48cecde9e5e2e9e8648393c8b71e6911cd1cbc9f
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 75d7b96a5821a71567816be81666e7fd6e97ef0f |
10-Sep-2012 |
mindyp <mindyp@google.com> |
am 168c2840: am 3aa118e7: Be extra careful with commas in recipient chips
* commit '168c284055805f84a054f8a52c60ef2cb37a6dae':
Be extra careful with commas in recipient chips
|
| 168c284055805f84a054f8a52c60ef2cb37a6dae |
10-Sep-2012 |
mindyp <mindyp@google.com> |
am 3aa118e7: Be extra careful with commas in recipient chips
* commit '3aa118e72c877b4c176d025c56bfad2e518bf1ce':
Be extra careful with commas in recipient chips
|
| 3aa118e72c877b4c176d025c56bfad2e518bf1ce |
10-Sep-2012 |
mindyp <mindyp@google.com> |
Be extra careful with commas in recipient chips
Fixes b/7132543 email addresses not recognized when using Gmail ICS
I added 2 in a row to be extra certain, and always check for the
LAST instance of ","
Change-Id: Id963971303a99642865a79c6264264e62a920151
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 024a256f40a302ca927881bf43a689a59acef28e |
06-Sep-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
| 02b41fb77586917ca37e64a69e95597b4288a73c |
06-Sep-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am c2533e15: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit 'c2533e15791f540bdee32b26fa3f5eceaab6125e':
|
| 367aa4681136d6e3d19864549859d7de60ec1010 |
06-Sep-2012 |
Adam Copp <adamcopp@google.com> |
Merge "Make setLightsOutMode protected"
|
| 4cf71b468e321dd8e775065ff8d9b8474b863aff |
06-Sep-2012 |
Adam Copp <adamcopp@google.com> |
Fix double-tap to restore from fullscreen
After auto-hiding the actionbar, two taps must be made to restore
the action bar.
this change fixes that by calling setFullScreen instead of just changing
lights out mode. This correctly updates the mFullScreen variable and
means only one tap is required to restore the action bar.
Bug: 7117697
Change-Id: I8645ca77c2f025868c487c2c63e7057d696d6dac
hotoviewer/src/com/android/ex/photo/PhotoViewActivity.java
|
| c2533e15791f540bdee32b26fa3f5eceaab6125e |
06-Sep-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr1-release - do not merge
Change-Id: I317647509d3e8feff6924360ef35ce12f354beb0
|
| 3177158f2471395017567332b38a0af972325f10 |
06-Sep-2012 |
Adam Copp <adamcopp@google.com> |
Make setLightsOutMode protected
setLightsOutMode becomes protected so that subclasses can reliably
hide and show ui elements when fullscreen mode is enabled.
Change-Id: I891cfd80b515df72020d5df21427247615f04a74
hotoviewer/src/com/android/ex/photo/PhotoViewActivity.java
|
| 1f3fc63e2b0c59964494082508d5d377e9d43016 |
05-Sep-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: I5c19caa87369ca3bfcacaf0a88333fc5de938496
Auto-generated-cl: translation import
hips/res/values-ko/strings.xml
|
| 762df274f96d6e4e176b0ee212fc2b508b5f247c |
28-Aug-2012 |
Adam Copp <adamcopp@google.com> |
Scope changes and removal of unnessecary variable
Adds isFullScreen() and setPhotoIndex() protected methods to
PhotoViewActivity in order to allow subclasses access to this
information.
Removes mDataValid from BaseCursorPagerAdapter since it was hiding how
simple the checks actually were (it was just mCursor != null)
A nullcheck has also been added to BaseFragmentPagerAdapter in
instantiateItem. in the long term, BaseCursorPagerAdapter should not be
so fragile, and should not surface nulls, but that change could be quite
involved, so should probably not be rolled into this change.
Change-Id: I4889c5ae2a764660926c70da25b85565f4600188
hotoviewer/src/com/android/ex/photo/PhotoViewActivity.java
hotoviewer/src/com/android/ex/photo/adapters/BaseCursorPagerAdapter.java
hotoviewer/src/com/android/ex/photo/adapters/BaseFragmentPagerAdapter.java
|
| b4206edfa1df21bd6a415f49561c65539b37497c |
04-Sep-2012 |
Adam Copp <adamcopp@google.com> |
Add parameter for max initial scale factor
you can now pass EXTRA_MAX_INITIAL_SCALE into PhotoViewActivity in order
to specify the maximum initial scale of images displayed. This parameter
defaults to 1x if now supplied, so images will not be displayed larger
than their actual size by default.
This allows the gmail team to resolve 7049410 whilst velvet can keep
something like the old behaviour (which is more natural for their app)
Bug: 7049410
Change-Id: I7d230666ca50a4634d8436519ed280cc6e558ee3
hotoviewer/src/com/android/ex/photo/Intents.java
hotoviewer/src/com/android/ex/photo/PhotoViewActivity.java
hotoviewer/src/com/android/ex/photo/adapters/PhotoPagerAdapter.java
hotoviewer/src/com/android/ex/photo/fragments/PhotoViewFragment.java
hotoviewer/src/com/android/ex/photo/views/PhotoView.java
|
| 83f80eb859710a55c867bfe5f11451f0cfcd301c |
03-Sep-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| 893e4c3c716679f142a5d64efb987fb8b833cd25 |
30-Aug-2012 |
Paul Westbrook <pwestbro@google.com> |
am 7d920938: am 45faaf4d: am 2b4059cd: Allow action bar to be updated
* commit '7d9209389c0c678cbd5a82d767fb6c984fcd0d64':
Allow action bar to be updated
|
| 7d9209389c0c678cbd5a82d767fb6c984fcd0d64 |
30-Aug-2012 |
Paul Westbrook <pwestbro@google.com> |
am 45faaf4d: am 2b4059cd: Allow action bar to be updated
* commit '45faaf4dfd9d59fd148ad898310571637ed64839':
Allow action bar to be updated
|
| 45faaf4dfd9d59fd148ad898310571637ed64839 |
30-Aug-2012 |
Paul Westbrook <pwestbro@google.com> |
am 2b4059cd: Allow action bar to be updated
* commit '2b4059cdcd8014265b3ec7f06b9502cebb9e9972':
Allow action bar to be updated
|
| 2b4059cdcd8014265b3ec7f06b9502cebb9e9972 |
30-Aug-2012 |
Paul Westbrook <pwestbro@google.com> |
Allow action bar to be updated
Allow the action bar to be updated when the photo list loader
loads data
Bug: 7082929
Change-Id: I476df1fa2ec7dcb1adfe5aed359a5126c60be179
hotoviewer/src/com/android/ex/photo/PhotoViewActivity.java
|
| 5da733e05a0cc73de0d56fba8a64a1839d75a028 |
30-Aug-2012 |
Mark Wei <markwei@google.com> |
resolved conflicts for merge of f688fc95 to master
Change-Id: Ib4ade547d76faa4a730b75ea691c1cf1f99888cd
|
| f688fc95529aae7aab75f631a9cffce9d20017f2 |
30-Aug-2012 |
Mark Wei <markwei@google.com> |
am da79838d: am a7e22413: Fix NullPointerException when tapping attachment.
* commit 'da79838d619c3ae45a34ef45964c562331cf30da':
Fix NullPointerException when tapping attachment.
|
| da79838d619c3ae45a34ef45964c562331cf30da |
30-Aug-2012 |
Mark Wei <markwei@google.com> |
am a7e22413: Fix NullPointerException when tapping attachment.
* commit 'a7e22413eb860a1d9ffb46221c63e29ba7330ff5':
Fix NullPointerException when tapping attachment.
|
| a7e22413eb860a1d9ffb46221c63e29ba7330ff5 |
30-Aug-2012 |
Mark Wei <markwei@google.com> |
Fix NullPointerException when tapping attachment.
Bug: 7083179
Change-Id: I9955aeda9a0d2bb6d30ce9f7e7e3961cb47284e0
hotoviewer/src/com/android/ex/photo/loaders/PhotoBitmapLoader.java
hotoviewer/src/com/android/ex/photo/util/ImageUtils.java
|
| 6ae12a5a8cca574f576c49cacd826aa9495d8417 |
30-Aug-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| 28bfd5ecc0d1828d1004f8a3163b738afc74967b |
30-Aug-2012 |
Mark Wei <markwei@google.com> |
am 97992e59: am c645df0a: am 4f38cc16: Attachment image viewer should not scale images larger than original size.
* commit '97992e595ffb8eef8a6a12609cc4da368d4e0f6f':
Attachment image viewer should not scale images larger than original size.
|
| 97992e595ffb8eef8a6a12609cc4da368d4e0f6f |
30-Aug-2012 |
Mark Wei <markwei@google.com> |
am c645df0a: am 4f38cc16: Attachment image viewer should not scale images larger than original size.
* commit 'c645df0a6d37dcf794e7ed8c8a334c08df8b9da6':
Attachment image viewer should not scale images larger than original size.
|
| c645df0a6d37dcf794e7ed8c8a334c08df8b9da6 |
30-Aug-2012 |
Mark Wei <markwei@google.com> |
am 4f38cc16: Attachment image viewer should not scale images larger than original size.
* commit '4f38cc1673163848c7b843cb9d23b21945b0bf82':
Attachment image viewer should not scale images larger than original size.
|
| 4f38cc1673163848c7b843cb9d23b21945b0bf82 |
30-Aug-2012 |
Mark Wei <markwei@google.com> |
Attachment image viewer should not scale images larger than original size.
Bug: 7049410
Change-Id: I1ed2555203e1541f1481cae4f17f532eaa57c1cd
hotoviewer/src/com/android/ex/photo/loaders/PhotoBitmapLoader.java
hotoviewer/src/com/android/ex/photo/views/PhotoView.java
|
| b74a42d1661820bb0aa6bddfaa6099f66eea68f3 |
29-Aug-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| 9cb4051d02351dfb400f31e5193f55d5c8d22b10 |
29-Aug-2012 |
Paul Westbrook <pwestbro@google.com> |
am 4689c6f8: am 162052cc: am 114cef99: Fix crash in email with attachments
* commit '4689c6f834a99fe8b57f2391bc14d13a3c6645cb':
Fix crash in email with attachments
|
| 4689c6f834a99fe8b57f2391bc14d13a3c6645cb |
29-Aug-2012 |
Paul Westbrook <pwestbro@google.com> |
am 162052cc: am 114cef99: Fix crash in email with attachments
* commit '162052ccf0501b267f47251595ab3d945880e7d2':
Fix crash in email with attachments
|
| 162052ccf0501b267f47251595ab3d945880e7d2 |
29-Aug-2012 |
Paul Westbrook <pwestbro@google.com> |
am 114cef99: Fix crash in email with attachments
* commit '114cef99189d693ed9cd8cf778a60823d06d5298':
Fix crash in email with attachments
|
| 114cef99189d693ed9cd8cf778a60823d06d5298 |
29-Aug-2012 |
Paul Westbrook <pwestbro@google.com> |
Fix crash in email with attachments
There isn't a need to call swapCursor in a runnable
Bug: 7072747
Change-Id: I0a0a9b6835acc4a1d1748c94f4d8bec4551638b0
hotoviewer/src/com/android/ex/photo/PhotoViewActivity.java
hotoviewer/src/com/android/ex/photo/adapters/PhotoPagerAdapter.java
|
| 998e478db542b3c8de6e7adb9e02ba476e10d422 |
28-Aug-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| 364c5e3cc2890aa03ec156e2ba02e8ece7c979a8 |
27-Aug-2012 |
mindyp <mindyp@google.com> |
am de6ae4fa: am feffe9dd: am 26e3f68a: Deal with commas within quoted text
* commit 'de6ae4fa07fd8c1cf3d68c0ae6a5029f298ffef3':
Deal with commas within quoted text
|
| de6ae4fa07fd8c1cf3d68c0ae6a5029f298ffef3 |
27-Aug-2012 |
mindyp <mindyp@google.com> |
am feffe9dd: am 26e3f68a: Deal with commas within quoted text
* commit 'feffe9dd89757533ade5926afc284f9369c8a9c4':
Deal with commas within quoted text
|
| feffe9dd89757533ade5926afc284f9369c8a9c4 |
27-Aug-2012 |
mindyp <mindyp@google.com> |
am 26e3f68a: Deal with commas within quoted text
* commit '26e3f68ae8342cedd57353e399e7d0e920228a4e':
Deal with commas within quoted text
|
| 26e3f68ae8342cedd57353e399e7d0e920228a4e |
27-Aug-2012 |
mindyp <mindyp@google.com> |
Deal with commas within quoted text
If there is a comma within quoted text, it is NOT a chip ending token
Fixes b/7001805 Names appended to email ids like "Mathew, Deepthi E" are split into two chips while replying
Change-Id: I87f34a44282b3baf8d106dd21f8211ad301395be
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 213cc88ebc9a795b1774f43859d938019d22372e |
24-Aug-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: I2e8d65682d5a198cb6e7c199c4f96369bc618ed9
Auto-generated-cl: translation import
arousel/test/res/values-in/strings.xml
|
| 8e1c7f72afc3b4aa6dc59ee37584fe06d8408633 |
23-Aug-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 90fc5310: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '90fc5310e57369e0b47b184cb18c2ec76afe6cca':
|
| 90fc5310e57369e0b47b184cb18c2ec76afe6cca |
23-Aug-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr1-release - do not merge
Change-Id: I4d3b9f6334bdccf63cbf10caaa83b84180c0ff20
|
| bea82a2d84d0a2c221cf13e9eff15980782d95a7 |
22-Aug-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| 34e9a4486aeeaa104f534629a0bea2fccd2bc88a |
22-Aug-2012 |
Adam Copp <adamcopp@google.com> |
Merge "Add HTTP uri handling & fetch thumbnail first"
|
| d7ae9863e34c878985d35133c3b56bee481ec4b1 |
22-Aug-2012 |
Adam Copp <adamcopp@google.com> |
Add HTTP uri handling & fetch thumbnail first
If a http:// or https:// url is specified as the thumbnail uri or
regular uri for an image, we attempt to fetch it over the internet.
Also, changed the order of loading so that we always attempt to fetch
the thumbnail image before we fetch the regular image. This aids in the
http:// uri case, since it should take significantly less time to be
presented with a thumbnail than the full image.
Finally, finishes the photo viewer activity when the "top" button on the
action bar is pressed, unless a custom override has been added.
These 3 changes could be seperated into different patches if you would
like
Change-Id: Iddc8cc6bef3f9e66198dfb98eb2f7bd309023b3f
hotoviewer/.gitignore
hotoviewer/src/com/android/ex/photo/PhotoViewActivity.java
hotoviewer/src/com/android/ex/photo/fragments/PhotoViewFragment.java
hotoviewer/src/com/android/ex/photo/util/ImageUtils.java
|
| 5f53c9840779cbe038c2aea348a3b0ff0c6817f5 |
22-Aug-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am b2b0fb50: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit 'b2b0fb506442f721b5ce5b89feda418c1be23a39':
|
| b2b0fb506442f721b5ce5b89feda418c1be23a39 |
22-Aug-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr1-release - do not merge
Change-Id: Ibba307bb9c4500e551fb4e7bb5e15c8f0ae1d683
|
| 6f05a046f0b916c211334624cf67a848365a2d82 |
21-Aug-2012 |
Marc Blank <mblank@google.com> |
am ef1e8ba3: am 501d1bf0: am 3b321528: Abort posted runnable if cursor is no longer open
* commit 'ef1e8ba35aaf56d81e25bf8042f4a332e34ef1f2':
Abort posted runnable if cursor is no longer open
|
| ef1e8ba35aaf56d81e25bf8042f4a332e34ef1f2 |
21-Aug-2012 |
Marc Blank <mblank@google.com> |
am 501d1bf0: am 3b321528: Abort posted runnable if cursor is no longer open
* commit '501d1bf0f0488adcfe5ce03c3d98c567b57a41fd':
Abort posted runnable if cursor is no longer open
|
| 501d1bf0f0488adcfe5ce03c3d98c567b57a41fd |
21-Aug-2012 |
Marc Blank <mblank@google.com> |
am 3b321528: Abort posted runnable if cursor is no longer open
* commit '3b32152852917f08eb2f196db6454c083f7acd15':
Abort posted runnable if cursor is no longer open
|
| 3b32152852917f08eb2f196db6454c083f7acd15 |
21-Aug-2012 |
Marc Blank <mblank@google.com> |
Abort posted runnable if cursor is no longer open
Bug: 7002552
Change-Id: I38ce1231b0ec88ebf02d4d0edb5495b8baac65d5
hotoviewer/src/com/android/ex/photo/PhotoViewActivity.java
|
| 17f30a64ec644d5066d8d56cbbdbf1e10e70ca5e |
21-Aug-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| 88d8382e69188430ddf872c38e39aefc59647d19 |
21-Aug-2012 |
Baligh Uddin <baligh@google.com> |
am 670c3df7: (-s ours) am edbaccd2: am 46e3466c: (-s ours) Import translations. DO NOT MERGE
* commit '670c3df7980334ac61be895b2d0f2d7dff8c59ae':
Import translations. DO NOT MERGE
|
| eef6981291d5f1a07d4f9c466bc6c27b25f8518d |
21-Aug-2012 |
Baligh Uddin <baligh@google.com> |
am f1ac0f42: (-s ours) am 91ca68b9: Import translations. DO NOT MERGE
* commit 'f1ac0f429611b19870c665d4ec4f1f93e5162c70':
Import translations. DO NOT MERGE
|
| 670c3df7980334ac61be895b2d0f2d7dff8c59ae |
21-Aug-2012 |
Baligh Uddin <baligh@google.com> |
am edbaccd2: am 46e3466c: (-s ours) Import translations. DO NOT MERGE
* commit 'edbaccd2ed8aa0d3efcdc6559faecc8dbe3c0b4c':
Import translations. DO NOT MERGE
|
| edbaccd2ed8aa0d3efcdc6559faecc8dbe3c0b4c |
21-Aug-2012 |
Baligh Uddin <baligh@google.com> |
am 46e3466c: (-s ours) Import translations. DO NOT MERGE
* commit '46e3466c6912d54a55bde7ee0e227c495a4fe639':
Import translations. DO NOT MERGE
|
| f1ac0f429611b19870c665d4ec4f1f93e5162c70 |
21-Aug-2012 |
Baligh Uddin <baligh@google.com> |
am 91ca68b9: Import translations. DO NOT MERGE
* commit '91ca68b95392c5899859ce64f481276094ac686b':
Import translations. DO NOT MERGE
|
| 82641c6654776bf687531aa211c3a282192ce40a |
20-Aug-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: I6c614369b21eebc77d1f107e07e96072a3fc9994
Auto-generated-cl: translation import
hotoviewer/sample/res/values-fa/strings.xml
|
| 46e3466c6912d54a55bde7ee0e227c495a4fe639 |
20-Aug-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: Idbc0ec87eb8a3b07a380375df7ccd63fc5b258bb
Auto-generated-cl: translation import
hotoviewer/sample/res/values-fa/strings.xml
|
| 91ca68b95392c5899859ce64f481276094ac686b |
20-Aug-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: I46586986f3e2adf4278d26f177c77d36f44c0c32
Auto-generated-cl: translation import
hotoviewer/sample/res/values-fa/strings.xml
|
| 277976e56b9fb84f0010585c0eb6fda4da1b4041 |
20-Aug-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| 08fb224d70c206bbd9fbc4bae24a6f98e57deed6 |
18-Aug-2012 |
Baligh Uddin <baligh@google.com> |
am c4fca47b: (-s ours) am 7a6016b4: am a7d8b798: (-s ours) Import translations. DO NOT MERGE
* commit 'c4fca47be9a95d7568c8a38e777bb7cf31986697':
Import translations. DO NOT MERGE
|
| fbdceda6fa3630c24e5156064ec02ca34dea016c |
18-Aug-2012 |
Baligh Uddin <baligh@google.com> |
am c5121aac: (-s ours) am eabadfe2: Import translations. DO NOT MERGE
* commit 'c5121aac635b9153c4f64a3f97fd6644e4a4439a':
Import translations. DO NOT MERGE
|
| c4fca47be9a95d7568c8a38e777bb7cf31986697 |
18-Aug-2012 |
Baligh Uddin <baligh@google.com> |
am 7a6016b4: am a7d8b798: (-s ours) Import translations. DO NOT MERGE
* commit '7a6016b4eafebd8f3baa49c92aeea913446d3fad':
Import translations. DO NOT MERGE
|
| c5121aac635b9153c4f64a3f97fd6644e4a4439a |
18-Aug-2012 |
Baligh Uddin <baligh@google.com> |
am eabadfe2: Import translations. DO NOT MERGE
* commit 'eabadfe27954d1a91b54d6c9fc08d44e570cdfda':
Import translations. DO NOT MERGE
|
| 7a6016b4eafebd8f3baa49c92aeea913446d3fad |
18-Aug-2012 |
Baligh Uddin <baligh@google.com> |
am a7d8b798: (-s ours) Import translations. DO NOT MERGE
* commit 'a7d8b7982d22901f386d0f8de1077ba39787017b':
Import translations. DO NOT MERGE
|
| 34b9f51c41165e9d055eac9b88033eb24fd77aaf |
17-Aug-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: I488f9f595cd8585aa50d2f531118414325a2b989
Auto-generated-cl: translation import
hotoviewer/sample/res/values-da/strings.xml
hotoviewer/sample/res/values-es-rUS/strings.xml
hotoviewer/sample/res/values-fr/strings.xml
hotoviewer/sample/res/values-ms/strings.xml
hotoviewer/sample/res/values-sw/strings.xml
hotoviewer/sample/res/values-zh-rCN/strings.xml
|
| a7d8b7982d22901f386d0f8de1077ba39787017b |
17-Aug-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: I0b76b4206e7ceca5b8456ad19a540e1be3d58de8
Auto-generated-cl: translation import
hotoviewer/sample/res/values-da/strings.xml
hotoviewer/sample/res/values-es-rUS/strings.xml
hotoviewer/sample/res/values-fr/strings.xml
hotoviewer/sample/res/values-ms/strings.xml
hotoviewer/sample/res/values-sw/strings.xml
hotoviewer/sample/res/values-zh-rCN/strings.xml
|
| eabadfe27954d1a91b54d6c9fc08d44e570cdfda |
17-Aug-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: Ie554b7c8f1730ae7402cbbcdb1bafec00348d835
Auto-generated-cl: translation import
hotoviewer/sample/res/values-da/strings.xml
hotoviewer/sample/res/values-es-rUS/strings.xml
hotoviewer/sample/res/values-fr/strings.xml
hotoviewer/sample/res/values-ms/strings.xml
hotoviewer/sample/res/values-sw/strings.xml
hotoviewer/sample/res/values-zh-rCN/strings.xml
|
| cf65080418253fce5c91003bd11e2fcfd8973789 |
17-Aug-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 857b75fd: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '857b75fd38cd16c02ac7f90abdc35dc1f5837693':
|
| 857b75fd38cd16c02ac7f90abdc35dc1f5837693 |
17-Aug-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr1-release - do not merge
Change-Id: Icab08c2aee9de42a7735b22ea756cbcc9c89833c
|
| b1cd9a199ddb1bfb219b44a808414a276c0be085 |
16-Aug-2012 |
Baligh Uddin <baligh@google.com> |
am 7ba0f66f: (-s ours) am 30cb80d9: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '7ba0f66f95d3da7909ffff7f5c305f5a422cf6e8':
Import translations. DO NOT MERGE
|
| 7ba0f66f95d3da7909ffff7f5c305f5a422cf6e8 |
16-Aug-2012 |
Baligh Uddin <baligh@google.com> |
am 30cb80d9: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '30cb80d9552c44376e284ba94cb3f61688446097':
Import translations. DO NOT MERGE
|
| 30cb80d9552c44376e284ba94cb3f61688446097 |
16-Aug-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
|
| b4aa104ce885b2ded886b7d316bc528addbb44d7 |
16-Aug-2012 |
Baligh Uddin <baligh@google.com> |
am d85c34b0: (-s ours) am 25ce1ff5: am 4b0047d8: (-s ours) Import translations. DO NOT MERGE
* commit 'd85c34b02df8ac03c9619edc220fa00a666f1cb7':
Import translations. DO NOT MERGE
|
| d85c34b02df8ac03c9619edc220fa00a666f1cb7 |
16-Aug-2012 |
Baligh Uddin <baligh@google.com> |
am 25ce1ff5: am 4b0047d8: (-s ours) Import translations. DO NOT MERGE
* commit '25ce1ff505703b5ff6573bac4025e116e1f14589':
Import translations. DO NOT MERGE
|
| 25ce1ff505703b5ff6573bac4025e116e1f14589 |
16-Aug-2012 |
Baligh Uddin <baligh@google.com> |
am 4b0047d8: (-s ours) Import translations. DO NOT MERGE
* commit '4b0047d89504b165ea1b0d7de59e9b6f29610267':
Import translations. DO NOT MERGE
|
| bb4150f1f94de6b45639361e59202b7ba7223cc5 |
16-Aug-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: Ic4e8b13083ae57dd81a3628d4a14f755a1fbb270
Auto-generated-cl: translation import
hotoviewer/sample/res/values-pt/strings.xml
|
| 4b0047d89504b165ea1b0d7de59e9b6f29610267 |
16-Aug-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: I3b0bfe3884f03d4ebdec81109a2d13791a4faafc
Auto-generated-cl: translation import
hotoviewer/sample/res/values-pt/strings.xml
|
| d75eade0fa37d4d371da04ac4ff23490f8def3c0 |
16-Aug-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: I06daa0fd7b18e39a2fde95689fe78637709501b8
Auto-generated-cl: translation import
hotoviewer/sample/res/values-pt/strings.xml
|
| c8d99a5b4e0b0f9e45f690cd7cce03161a4722c5 |
16-Aug-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| 2a22329e6fd79e0b1daecfa469f4e418eb26197b |
16-Aug-2012 |
Baligh Uddin <baligh@google.com> |
am 2c2fa14c: (-s ours) am 71ff394c: am 63dc248a: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail
* commit '2c2fa14cb85c6f1cfc657439e4f598752e9126aa':
Import translations. DO NOT MERGE
|
| 2c2fa14cb85c6f1cfc657439e4f598752e9126aa |
16-Aug-2012 |
Baligh Uddin <baligh@google.com> |
am 71ff394c: am 63dc248a: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail
* commit '71ff394c416fa95174f70b73b5b05635ab61d1a4':
Import translations. DO NOT MERGE
|
| f60ef0f06ebcd409d5fac5edafa6c4157bcd5df1 |
16-Aug-2012 |
Baligh Uddin <baligh@google.com> |
am 53b0e008: (-s ours) am 00b447ba: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '53b0e008013b0b8051c9d13c7fd9ff6c4b52a1cd':
Import translations. DO NOT MERGE
|
| 71ff394c416fa95174f70b73b5b05635ab61d1a4 |
16-Aug-2012 |
Baligh Uddin <baligh@google.com> |
am 63dc248a: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail
* commit '63dc248ac8694b9aac6553fe667fdd176a0a591d':
Import translations. DO NOT MERGE
|
| 53b0e008013b0b8051c9d13c7fd9ff6c4b52a1cd |
16-Aug-2012 |
Baligh Uddin <baligh@google.com> |
am 00b447ba: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '00b447bad5c72dfde56fb6d15f6a2a682a4734f4':
Import translations. DO NOT MERGE
|
| 80905a053cb5ad09bc57a3d65fd98b8a9a8f4076 |
16-Aug-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
| 63dc248ac8694b9aac6553fe667fdd176a0a591d |
16-Aug-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-ub-mail
|
| 00b447bad5c72dfde56fb6d15f6a2a682a4734f4 |
16-Aug-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
|
| d246beaac2d783032445070aae41f913eae88b9f |
16-Aug-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: I2ce3d15b85e4a32ca9870606cc3636c5796eeb3a
Auto-generated-cl: translation import
hotoviewer/sample/res/values-sl/strings.xml
|
| 419c2d1ba65e370eef149fe1f6fea805add46b43 |
16-Aug-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: Icd9cda3aa634cddf8429e243a2bf9a84311931be
Auto-generated-cl: translation import
hotoviewer/sample/res/values-sl/strings.xml
|
| cfa0a7a636ddbc2b0242353a76c4cae68ca3a3ea |
16-Aug-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: Ifce442d08e437b4bc373f53c7f11c34fc9cb026d
Auto-generated-cl: translation import
hotoviewer/sample/res/values-sl/strings.xml
|
| 3cc133fe36e86783dae73525d97a36b75a61908a |
15-Aug-2012 |
Paul Westbrook <pwestbro@google.com> |
am 48f32e2b: am 8c38139e: am 459c618b: Fix some photo view problems
* commit '48f32e2bd993a91542b08c2efdbbb2b940273099':
Fix some photo view problems
|
| 48f32e2bd993a91542b08c2efdbbb2b940273099 |
15-Aug-2012 |
Paul Westbrook <pwestbro@google.com> |
am 8c38139e: am 459c618b: Fix some photo view problems
* commit '8c38139ed06c95621497d5b786843ee5d274fbc4':
Fix some photo view problems
|
| 8c38139ed06c95621497d5b786843ee5d274fbc4 |
15-Aug-2012 |
Paul Westbrook <pwestbro@google.com> |
am 459c618b: Fix some photo view problems
* commit '459c618b574a3d3b6a544267a87c2093bacac20d':
Fix some photo view problems
|
| 459c618b574a3d3b6a544267a87c2093bacac20d |
14-Aug-2012 |
Paul Westbrook <pwestbro@google.com> |
Fix some photo view problems
Make sure to stop the indeterminate progress bare when we can't
load an image
Bug: 6956516
Change-Id: Ifb69ca2e08a8ddfb351989d8e276e7fb6e3b06e5
hotoviewer/src/com/android/ex/photo/PhotoViewActivity.java
hotoviewer/src/com/android/ex/photo/adapters/BaseFragmentPagerAdapter.java
hotoviewer/src/com/android/ex/photo/fragments/PhotoViewFragment.java
hotoviewer/src/com/android/ex/photo/views/ProgressBarWrapper.java
|
| ad379b9393e46ba0e5f5b99e9e1008513fb1d37a |
15-Aug-2012 |
Baligh Uddin <baligh@google.com> |
am 336d6192: (-s ours) am c350a01c: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '336d619262471bb172b32ad3fc838d96ebc70bb8':
Import translations. DO NOT MERGE
|
| 336d619262471bb172b32ad3fc838d96ebc70bb8 |
15-Aug-2012 |
Baligh Uddin <baligh@google.com> |
am c350a01c: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit 'c350a01c90f3187c31f4182438ee88564ef727c1':
Import translations. DO NOT MERGE
|
| c350a01c90f3187c31f4182438ee88564ef727c1 |
15-Aug-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
|
| 84816c240c986b12499753f5baff9bb35f2b1696 |
15-Aug-2012 |
Baligh Uddin <baligh@google.com> |
am 0ef943bf: (-s ours) am a0038bc0: am 90fc1976: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail
* commit '0ef943bf1a98056073a6566eb2f2c7ee5524a1e6':
Import translations. DO NOT MERGE
|
| 0ef943bf1a98056073a6566eb2f2c7ee5524a1e6 |
15-Aug-2012 |
Baligh Uddin <baligh@google.com> |
am a0038bc0: am 90fc1976: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail
* commit 'a0038bc077a6e6423562ebc9bbbffb9a2831fff1':
Import translations. DO NOT MERGE
|
| a0038bc077a6e6423562ebc9bbbffb9a2831fff1 |
15-Aug-2012 |
Baligh Uddin <baligh@google.com> |
am 90fc1976: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail
* commit '90fc1976a112090948adf8112c1642c9cbbc4392':
Import translations. DO NOT MERGE
|
| 90fc1976a112090948adf8112c1642c9cbbc4392 |
15-Aug-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-ub-mail
|
| 044710082d786c5914f6f9eac897400bd48a6c7c |
15-Aug-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
| 6e0be1cb8538072c086851082bb1af87d13a7c34 |
15-Aug-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 520583e8: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '520583e878a1de97ec3999cecdf3c758ecf0cfb0':
|
| 520583e878a1de97ec3999cecdf3c758ecf0cfb0 |
15-Aug-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr1-release - do not merge
Change-Id: If42d4da974aa3e5319ced3a72e9718cf9d377209
|
| e9e1291365ca653943ad64e6d92a2b29233c869f |
15-Aug-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| 691355d015d3d9939677705a64a49056668e6762 |
15-Aug-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: Idf2d71d2ceb7b626fb04338e3cdd8f7d1e271b90
Auto-generated-cl: translation import
hotoviewer/sample/res/values-af/strings.xml
hotoviewer/sample/res/values-bg/strings.xml
hotoviewer/sample/res/values-es-rUS/strings.xml
hotoviewer/sample/res/values-fa/strings.xml
hotoviewer/sample/res/values-ja/strings.xml
hotoviewer/sample/res/values-ko/strings.xml
hotoviewer/sample/res/values-ms/strings.xml
hotoviewer/sample/res/values-pt/strings.xml
hotoviewer/sample/res/values-ro/strings.xml
hotoviewer/sample/res/values-sk/strings.xml
hotoviewer/sample/res/values-tr/strings.xml
hotoviewer/sample/res/values-zh-rCN/strings.xml
|
| 798b19cb17438afa0683561977c153cebecfe8aa |
15-Aug-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: I986e7913c40cf76c35081b1aa4a25e29bb8987a7
Auto-generated-cl: translation import
hotoviewer/sample/res/values-af/strings.xml
hotoviewer/sample/res/values-bg/strings.xml
hotoviewer/sample/res/values-es-rUS/strings.xml
hotoviewer/sample/res/values-fa/strings.xml
hotoviewer/sample/res/values-ja/strings.xml
hotoviewer/sample/res/values-ko/strings.xml
hotoviewer/sample/res/values-ms/strings.xml
hotoviewer/sample/res/values-pt/strings.xml
hotoviewer/sample/res/values-ro/strings.xml
hotoviewer/sample/res/values-sk/strings.xml
hotoviewer/sample/res/values-tr/strings.xml
hotoviewer/sample/res/values-zh-rCN/strings.xml
|
| 311dffa75011e8c43f1fc5f131be97de90ef68a8 |
15-Aug-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: I22b390a9df3d9d3c0f22995f132cea2c21c80107
Auto-generated-cl: translation import
hotoviewer/sample/res/values-af/strings.xml
hotoviewer/sample/res/values-bg/strings.xml
hotoviewer/sample/res/values-es-rUS/strings.xml
hotoviewer/sample/res/values-fa/strings.xml
hotoviewer/sample/res/values-ja/strings.xml
hotoviewer/sample/res/values-ko/strings.xml
hotoviewer/sample/res/values-ms/strings.xml
hotoviewer/sample/res/values-pt/strings.xml
hotoviewer/sample/res/values-ro/strings.xml
hotoviewer/sample/res/values-sk/strings.xml
hotoviewer/sample/res/values-tr/strings.xml
hotoviewer/sample/res/values-zh-rCN/strings.xml
|
| 1779ac46bfa5ffe1e8b7ea20f43904741e77251d |
14-Aug-2012 |
Baligh Uddin <baligh@google.com> |
am f2ad95de: (-s ours) am 4848f768: am c164a022: (-s ours) Import translations. DO NOT MERGE
* commit 'f2ad95de47061742ac46721e0ba987437115faac':
Import translations. DO NOT MERGE
|
| f2ad95de47061742ac46721e0ba987437115faac |
14-Aug-2012 |
Baligh Uddin <baligh@google.com> |
am 4848f768: am c164a022: (-s ours) Import translations. DO NOT MERGE
* commit '4848f768080fa0c24189176a45ee09dc6ba86fcf':
Import translations. DO NOT MERGE
|
| 4848f768080fa0c24189176a45ee09dc6ba86fcf |
14-Aug-2012 |
Baligh Uddin <baligh@google.com> |
am c164a022: (-s ours) Import translations. DO NOT MERGE
* commit 'c164a02272694e9e750f5d6dff79fbfdf457b8fb':
Import translations. DO NOT MERGE
|
| b665835db6667b268bbce1672fb4d3d970e106f8 |
14-Aug-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
| 3421ac177d0e26e83d9530bc6ccdcbcc3acc1a15 |
14-Aug-2012 |
Baligh Uddin <baligh@google.com> |
am a76b8d73: (-s ours) am 612a55b5: Import translations. DO NOT MERGE
* commit 'a76b8d73fd3ae50bad30425596118ac15407427d':
Import translations. DO NOT MERGE
|
| 1ba31310e974fb9547264b57f407b43fa21202a4 |
14-Aug-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: I8b51828c6f32970b80bce270ca7c6744a2791386
Auto-generated-cl: translation import
hotoviewer/sample/res/values-af/strings.xml
hotoviewer/sample/res/values-bg/strings.xml
hotoviewer/sample/res/values-es-rUS/strings.xml
hotoviewer/sample/res/values-fa/strings.xml
hotoviewer/sample/res/values-ja/strings.xml
hotoviewer/sample/res/values-ko/strings.xml
hotoviewer/sample/res/values-pt/strings.xml
hotoviewer/sample/res/values-ro/strings.xml
hotoviewer/sample/res/values-sk/strings.xml
hotoviewer/sample/res/values-tr/strings.xml
hotoviewer/sample/res/values-zh-rCN/strings.xml
|
| a76b8d73fd3ae50bad30425596118ac15407427d |
14-Aug-2012 |
Baligh Uddin <baligh@google.com> |
am 612a55b5: Import translations. DO NOT MERGE
* commit '612a55b56842d65af15c5c2807424113aa66ebc0':
Import translations. DO NOT MERGE
|
| c164a02272694e9e750f5d6dff79fbfdf457b8fb |
14-Aug-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: I0ce5691e0dcce4a800500b82cb7696ac9d016949
Auto-generated-cl: translation import
hotoviewer/sample/res/values-af/strings.xml
hotoviewer/sample/res/values-bg/strings.xml
hotoviewer/sample/res/values-es-rUS/strings.xml
hotoviewer/sample/res/values-fa/strings.xml
hotoviewer/sample/res/values-ja/strings.xml
hotoviewer/sample/res/values-ko/strings.xml
hotoviewer/sample/res/values-pt/strings.xml
hotoviewer/sample/res/values-ro/strings.xml
hotoviewer/sample/res/values-sk/strings.xml
hotoviewer/sample/res/values-tr/strings.xml
hotoviewer/sample/res/values-zh-rCN/strings.xml
|
| 612a55b56842d65af15c5c2807424113aa66ebc0 |
14-Aug-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: I936642c83831c5aca0c1a21c811f183c32eef398
Auto-generated-cl: translation import
hotoviewer/sample/res/values-af/strings.xml
hotoviewer/sample/res/values-bg/strings.xml
hotoviewer/sample/res/values-es-rUS/strings.xml
hotoviewer/sample/res/values-fa/strings.xml
hotoviewer/sample/res/values-ja/strings.xml
hotoviewer/sample/res/values-ko/strings.xml
hotoviewer/sample/res/values-pt/strings.xml
hotoviewer/sample/res/values-ro/strings.xml
hotoviewer/sample/res/values-sk/strings.xml
hotoviewer/sample/res/values-tr/strings.xml
hotoviewer/sample/res/values-zh-rCN/strings.xml
|
| e02251d7274c33b068f8696f1daf3a2b22125e1a |
14-Aug-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| 0b0e61495090e45e5be454df4dcd5eff2b828a94 |
14-Aug-2012 |
Baligh Uddin <baligh@google.com> |
am 605ea021: (-s ours) am f8a0de00: am db874c73: (-s ours) Import translations. DO NOT MERGE
* commit '605ea02149d4bdf6e97e42a695a756d1e1ff8b27':
Import translations. DO NOT MERGE
|
| 605ea02149d4bdf6e97e42a695a756d1e1ff8b27 |
14-Aug-2012 |
Baligh Uddin <baligh@google.com> |
am f8a0de00: am db874c73: (-s ours) Import translations. DO NOT MERGE
* commit 'f8a0de00dbba0b10b8928e03a2d749de73ba0fa9':
Import translations. DO NOT MERGE
|
| 0f5b1e9f9bc736822df5140b01d97125ec526160 |
14-Aug-2012 |
Baligh Uddin <baligh@google.com> |
am a2bc0368: (-s ours) am de8b438f: Import translations. DO NOT MERGE
* commit 'a2bc0368a90050daeaf3fc94df420c5054994dde':
Import translations. DO NOT MERGE
|
| f8a0de00dbba0b10b8928e03a2d749de73ba0fa9 |
14-Aug-2012 |
Baligh Uddin <baligh@google.com> |
am db874c73: (-s ours) Import translations. DO NOT MERGE
* commit 'db874c736d6287bcfdad499ef1effaadb08c67cb':
Import translations. DO NOT MERGE
|
| a2bc0368a90050daeaf3fc94df420c5054994dde |
14-Aug-2012 |
Baligh Uddin <baligh@google.com> |
am de8b438f: Import translations. DO NOT MERGE
* commit 'de8b438f7b8055eda1d3fd917a160f75b6ad29b0':
Import translations. DO NOT MERGE
|
| 1297cbe8f0e4ecbd639727c583bb8e89f3e5c334 |
13-Aug-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: Ic971bb44b23672e2bd887a1167111a85a34eac64
Auto-generated-cl: translation import
hotoviewer/sample/res/values-am/strings.xml
hotoviewer/sample/res/values-ar/strings.xml
hotoviewer/sample/res/values-be/strings.xml
hotoviewer/sample/res/values-ca/strings.xml
hotoviewer/sample/res/values-cs/strings.xml
hotoviewer/sample/res/values-da/strings.xml
hotoviewer/sample/res/values-de/strings.xml
hotoviewer/sample/res/values-el/strings.xml
hotoviewer/sample/res/values-en-rGB/strings.xml
hotoviewer/sample/res/values-es/strings.xml
hotoviewer/sample/res/values-et/strings.xml
hotoviewer/sample/res/values-fi/strings.xml
hotoviewer/sample/res/values-fr/strings.xml
hotoviewer/sample/res/values-hi/strings.xml
hotoviewer/sample/res/values-hr/strings.xml
hotoviewer/sample/res/values-hu/strings.xml
hotoviewer/sample/res/values-in/strings.xml
hotoviewer/sample/res/values-it/strings.xml
hotoviewer/sample/res/values-iw/strings.xml
hotoviewer/sample/res/values-lt/strings.xml
hotoviewer/sample/res/values-lv/strings.xml
hotoviewer/sample/res/values-nb/strings.xml
hotoviewer/sample/res/values-nl/strings.xml
hotoviewer/sample/res/values-pl/strings.xml
hotoviewer/sample/res/values-pt-rPT/strings.xml
hotoviewer/sample/res/values-ru/strings.xml
hotoviewer/sample/res/values-sr/strings.xml
hotoviewer/sample/res/values-sv/strings.xml
hotoviewer/sample/res/values-sw/strings.xml
hotoviewer/sample/res/values-th/strings.xml
hotoviewer/sample/res/values-tl/strings.xml
hotoviewer/sample/res/values-uk/strings.xml
hotoviewer/sample/res/values-vi/strings.xml
hotoviewer/sample/res/values-zh-rTW/strings.xml
hotoviewer/sample/res/values-zu/strings.xml
|
| db874c736d6287bcfdad499ef1effaadb08c67cb |
13-Aug-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: If457f15f47a6b6b2ab3df6320b75cad7e8c4f6c5
Auto-generated-cl: translation import
hotoviewer/sample/res/values-am/strings.xml
hotoviewer/sample/res/values-ar/strings.xml
hotoviewer/sample/res/values-be/strings.xml
hotoviewer/sample/res/values-ca/strings.xml
hotoviewer/sample/res/values-cs/strings.xml
hotoviewer/sample/res/values-da/strings.xml
hotoviewer/sample/res/values-de/strings.xml
hotoviewer/sample/res/values-el/strings.xml
hotoviewer/sample/res/values-en-rGB/strings.xml
hotoviewer/sample/res/values-es/strings.xml
hotoviewer/sample/res/values-et/strings.xml
hotoviewer/sample/res/values-fi/strings.xml
hotoviewer/sample/res/values-fr/strings.xml
hotoviewer/sample/res/values-hi/strings.xml
hotoviewer/sample/res/values-hr/strings.xml
hotoviewer/sample/res/values-hu/strings.xml
hotoviewer/sample/res/values-in/strings.xml
hotoviewer/sample/res/values-it/strings.xml
hotoviewer/sample/res/values-iw/strings.xml
hotoviewer/sample/res/values-lt/strings.xml
hotoviewer/sample/res/values-lv/strings.xml
hotoviewer/sample/res/values-nb/strings.xml
hotoviewer/sample/res/values-nl/strings.xml
hotoviewer/sample/res/values-pl/strings.xml
hotoviewer/sample/res/values-pt-rPT/strings.xml
hotoviewer/sample/res/values-ru/strings.xml
hotoviewer/sample/res/values-sr/strings.xml
hotoviewer/sample/res/values-sv/strings.xml
hotoviewer/sample/res/values-sw/strings.xml
hotoviewer/sample/res/values-th/strings.xml
hotoviewer/sample/res/values-tl/strings.xml
hotoviewer/sample/res/values-uk/strings.xml
hotoviewer/sample/res/values-vi/strings.xml
hotoviewer/sample/res/values-zh-rTW/strings.xml
hotoviewer/sample/res/values-zu/strings.xml
|
| de8b438f7b8055eda1d3fd917a160f75b6ad29b0 |
13-Aug-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: Ibb618dd0a94857b3d45f40a586f9cc5b51dadd10
Auto-generated-cl: translation import
hotoviewer/sample/res/values-am/strings.xml
hotoviewer/sample/res/values-ar/strings.xml
hotoviewer/sample/res/values-be/strings.xml
hotoviewer/sample/res/values-ca/strings.xml
hotoviewer/sample/res/values-cs/strings.xml
hotoviewer/sample/res/values-da/strings.xml
hotoviewer/sample/res/values-de/strings.xml
hotoviewer/sample/res/values-el/strings.xml
hotoviewer/sample/res/values-en-rGB/strings.xml
hotoviewer/sample/res/values-es/strings.xml
hotoviewer/sample/res/values-et/strings.xml
hotoviewer/sample/res/values-fi/strings.xml
hotoviewer/sample/res/values-fr/strings.xml
hotoviewer/sample/res/values-hi/strings.xml
hotoviewer/sample/res/values-hr/strings.xml
hotoviewer/sample/res/values-hu/strings.xml
hotoviewer/sample/res/values-in/strings.xml
hotoviewer/sample/res/values-it/strings.xml
hotoviewer/sample/res/values-iw/strings.xml
hotoviewer/sample/res/values-lt/strings.xml
hotoviewer/sample/res/values-lv/strings.xml
hotoviewer/sample/res/values-nb/strings.xml
hotoviewer/sample/res/values-nl/strings.xml
hotoviewer/sample/res/values-pl/strings.xml
hotoviewer/sample/res/values-pt-rPT/strings.xml
hotoviewer/sample/res/values-ru/strings.xml
hotoviewer/sample/res/values-sr/strings.xml
hotoviewer/sample/res/values-sv/strings.xml
hotoviewer/sample/res/values-sw/strings.xml
hotoviewer/sample/res/values-th/strings.xml
hotoviewer/sample/res/values-tl/strings.xml
hotoviewer/sample/res/values-uk/strings.xml
hotoviewer/sample/res/values-vi/strings.xml
hotoviewer/sample/res/values-zh-rTW/strings.xml
hotoviewer/sample/res/values-zu/strings.xml
|
| b5f28caa3e2a52e528620ee65b446b6d6373b675 |
13-Aug-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| 8c1bcb464b381b06dc65a563b3b740983bce6ac1 |
11-Aug-2012 |
Andrew Sapperstein <asapperstein@google.com> |
am 7a1f4dc1: am 918793fd: am d5cfe290: Created a sample photo viewer implementation.
* commit '7a1f4dc117f3cfd3b8aebfaec220b21693c77b27':
Created a sample photo viewer implementation.
|
| 7a1f4dc117f3cfd3b8aebfaec220b21693c77b27 |
11-Aug-2012 |
Andrew Sapperstein <asapperstein@google.com> |
am 918793fd: am d5cfe290: Created a sample photo viewer implementation.
* commit '918793fd23bb8d4a191dfdd38f5d8e89b2de4bec':
Created a sample photo viewer implementation.
|
| 918793fd23bb8d4a191dfdd38f5d8e89b2de4bec |
11-Aug-2012 |
Andrew Sapperstein <asapperstein@google.com> |
am d5cfe290: Created a sample photo viewer implementation.
* commit 'd5cfe29032281253f9d6d9e1630323cc64127e9f':
Created a sample photo viewer implementation.
|
| d5cfe29032281253f9d6d9e1630323cc64127e9f |
11-Aug-2012 |
Andrew Sapperstein <asapperstein@google.com> |
Created a sample photo viewer implementation.
Change-Id: Ida5ab5c3247a52c5fbbd495d6e127c18493356ce
hotoviewer/Android.mk
hotoviewer/sample/Android.mk
hotoviewer/sample/AndroidManifest.xml
hotoviewer/sample/assets/blah.png
hotoviewer/sample/assets/galaxy.png
hotoviewer/sample/assets/johannson.png
hotoviewer/sample/assets/planets.png
hotoviewer/sample/res/drawable-hdpi/ic_action_search.png
hotoviewer/sample/res/drawable-hdpi/ic_launcher.png
hotoviewer/sample/res/drawable-mdpi/ic_action_search.png
hotoviewer/sample/res/drawable-mdpi/ic_launcher.png
hotoviewer/sample/res/drawable-xhdpi/ic_action_search.png
hotoviewer/sample/res/drawable-xhdpi/ic_launcher.png
hotoviewer/sample/res/layout/activity_main.xml
hotoviewer/sample/res/menu/activity_main.xml
hotoviewer/sample/res/values/dimens.xml
hotoviewer/sample/res/values/strings.xml
hotoviewer/sample/res/values/styles.xml
hotoviewer/sample/src/com/example/photoviewersample/MainActivity.java
hotoviewer/sample/src/com/example/photoviewersample/SampleProvider.java
hotoviewer/src/com/android/ex/photo/provider/PhotoContract.java
|
| 2b88aa53d513e58e38a27aeb867f3d0f576df854 |
11-Aug-2012 |
Baligh Uddin <baligh@google.com> |
am 9bc4d7b0: (-s ours) am 96b94f41: am 07bbd1f1: (-s ours) Import translations. DO NOT MERGE
* commit '9bc4d7b021c10c26262ed6fb0f6e084ba6a1fd30':
Import translations. DO NOT MERGE
|
| b6943c312ad86d1df9e7e0448cf5965427993cc1 |
11-Aug-2012 |
Baligh Uddin <baligh@google.com> |
am 6c47fbb6: (-s ours) am 1d48b60b: Import translations. DO NOT MERGE
* commit '6c47fbb6900cd1ad37e2c011e6b50ec5deecbd4a':
Import translations. DO NOT MERGE
|
| 9bc4d7b021c10c26262ed6fb0f6e084ba6a1fd30 |
11-Aug-2012 |
Baligh Uddin <baligh@google.com> |
am 96b94f41: am 07bbd1f1: (-s ours) Import translations. DO NOT MERGE
* commit '96b94f41f25da86c23a926af381eae6847e98fd8':
Import translations. DO NOT MERGE
|
| 6c47fbb6900cd1ad37e2c011e6b50ec5deecbd4a |
11-Aug-2012 |
Baligh Uddin <baligh@google.com> |
am 1d48b60b: Import translations. DO NOT MERGE
* commit '1d48b60bac0e60cb97922a67b7bb1a13b4e38f3b':
Import translations. DO NOT MERGE
|
| 96b94f41f25da86c23a926af381eae6847e98fd8 |
11-Aug-2012 |
Baligh Uddin <baligh@google.com> |
am 07bbd1f1: (-s ours) Import translations. DO NOT MERGE
* commit '07bbd1f1b87033c07cc990137641e627e89d5975':
Import translations. DO NOT MERGE
|
| 986c4ddc4ac11210950b4a5514f302229be249a1 |
11-Aug-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
| 53ead1a170b8e044c3d851cfffab1e106cea4fd3 |
10-Aug-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: I04fe07570afd0d3b85d24b48b96786ab748f5095
Auto-generated-cl: translation import
hotoviewer/res/values-es-rUS/strings.xml
|
| 07bbd1f1b87033c07cc990137641e627e89d5975 |
10-Aug-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: Ieb0d6ac2c8f37ae7df5aaf28a4b810cbfa978291
Auto-generated-cl: translation import
hotoviewer/res/values-es-rUS/strings.xml
|
| 1d48b60bac0e60cb97922a67b7bb1a13b4e38f3b |
10-Aug-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: I8222ac2b86d26fde17decfa6258bba8cc83d7698
Auto-generated-cl: translation import
hotoviewer/res/values-es-rUS/strings.xml
|
| d755488125ce7727b9fdcc5f08208bdf1d7718ac |
10-Aug-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 1154e0ca: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '1154e0cad2991e4a57ffb94125cbded759138413':
|
| 1154e0cad2991e4a57ffb94125cbded759138413 |
10-Aug-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr1-release - do not merge
Change-Id: I23bef16b00b5d543c302693c8c037472d03905cb
|
| d8525c7fcaf916821574f45e52a1f035effcf3a7 |
09-Aug-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| e883ebf58659d8e68382ff243458c79617960c4c |
09-Aug-2012 |
Baligh Uddin <baligh@google.com> |
am 74cfe725: (-s ours) am 7d0c848e: am f6c7fbf4: (-s ours) Import translations. DO NOT MERGE
* commit '74cfe72556fca97db427258a0c093598624948ba':
Import translations. DO NOT MERGE
|
| efce44eef3de72a0ecbc5c0c55c0dff91b8ffaa6 |
09-Aug-2012 |
Baligh Uddin <baligh@google.com> |
am 2321e6a1: (-s ours) am c4724bca: Import translations. DO NOT MERGE
* commit '2321e6a1824997d25cac64d3ce7429e64659ac69':
Import translations. DO NOT MERGE
|
| 74cfe72556fca97db427258a0c093598624948ba |
09-Aug-2012 |
Baligh Uddin <baligh@google.com> |
am 7d0c848e: am f6c7fbf4: (-s ours) Import translations. DO NOT MERGE
* commit '7d0c848e6ccd201ec5f021d813d4c6a0a0892300':
Import translations. DO NOT MERGE
|
| 2321e6a1824997d25cac64d3ce7429e64659ac69 |
09-Aug-2012 |
Baligh Uddin <baligh@google.com> |
am c4724bca: Import translations. DO NOT MERGE
* commit 'c4724bcab3b11033895738fe4f130e2debfbb0b6':
Import translations. DO NOT MERGE
|
| 7d0c848e6ccd201ec5f021d813d4c6a0a0892300 |
09-Aug-2012 |
Baligh Uddin <baligh@google.com> |
am f6c7fbf4: (-s ours) Import translations. DO NOT MERGE
* commit 'f6c7fbf4710e5ee0485d3435df5a543e0afb5b37':
Import translations. DO NOT MERGE
|
| 5c8d50a4aa29353ba47d885a94949c70200c5fed |
08-Aug-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: Ibc483be842c65253161a1d21368632f4cce0199b
Auto-generated-cl: translation import
hotoviewer/res/values-en-rGB/strings.xml
hotoviewer/res/values-ms/strings.xml
|
| f6c7fbf4710e5ee0485d3435df5a543e0afb5b37 |
08-Aug-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: Iadfae19e66548dece07927db956c9b5274a1c20d
Auto-generated-cl: translation import
hotoviewer/res/values-en-rGB/strings.xml
hotoviewer/res/values-ms/strings.xml
|
| c4724bcab3b11033895738fe4f130e2debfbb0b6 |
08-Aug-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: I4f002587bcd1f579394771a4c311e4d85c58198a
Auto-generated-cl: translation import
hotoviewer/res/values-en-rGB/strings.xml
hotoviewer/res/values-ms/strings.xml
|
| 03f41bd2f38c4a9cedeb2521721462e397a68b78 |
08-Aug-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 8e8e677d: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '8e8e677d421bd0c7df9e12703ef04173b14f52d3':
|
| 8e8e677d421bd0c7df9e12703ef04173b14f52d3 |
08-Aug-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr1-release - do not merge
Change-Id: I0468e272e811dcb63388806fb621ac2fb8f11fc7
|
| cecd694228041699c65c90c7d98ecec63c2d7c85 |
08-Aug-2012 |
Baligh Uddin <baligh@google.com> |
am f4c1475e: (-s ours) am 00434249: am a120545c: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail
* commit 'f4c1475ef80dffcdc78cc6874b710c74a920e1e3':
Import translations. DO NOT MERGE
|
| f4c1475ef80dffcdc78cc6874b710c74a920e1e3 |
08-Aug-2012 |
Baligh Uddin <baligh@google.com> |
am 00434249: am a120545c: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail
* commit '0043424933722beec9fbd36931a9063f9e080e29':
Import translations. DO NOT MERGE
|
| 211960f1290008e498580d6faea0131800e676c7 |
08-Aug-2012 |
Baligh Uddin <baligh@google.com> |
am c0d4e926: (-s ours) am a8361064: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit 'c0d4e926851c62480ce79e9496270718bd44fa77':
Import translations. DO NOT MERGE
|
| c0d4e926851c62480ce79e9496270718bd44fa77 |
08-Aug-2012 |
Baligh Uddin <baligh@google.com> |
am a8361064: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit 'a83610643fa7ffeac434b20af7c3aec5f6c9fa84':
Import translations. DO NOT MERGE
|
| 0043424933722beec9fbd36931a9063f9e080e29 |
08-Aug-2012 |
Baligh Uddin <baligh@google.com> |
am a120545c: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail
* commit 'a120545cbc6ae50683c26f508a1ba30e12c44c8f':
Import translations. DO NOT MERGE
|
| a83610643fa7ffeac434b20af7c3aec5f6c9fa84 |
08-Aug-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
|
| a120545cbc6ae50683c26f508a1ba30e12c44c8f |
08-Aug-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-ub-mail
|
| f735784699d119438f0ceda64bbb74672db75d39 |
08-Aug-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| 724d9f3e1d27c37a4932bccaececf3ba92de7477 |
08-Aug-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
| 33bd51dbbaad25f1f7c002ec5b1db14a63fdf8e2 |
07-Aug-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: Ia9fc198d9003cb9f3e5cabdf1408115c9ea9e992
Auto-generated-cl: translation import
hotoviewer/res/values-bg/strings.xml
hotoviewer/res/values-de/strings.xml
hotoviewer/res/values-es-rUS/strings.xml
hotoviewer/res/values-et/strings.xml
hotoviewer/res/values-fr/strings.xml
hotoviewer/res/values-hi/strings.xml
hotoviewer/res/values-hr/strings.xml
hotoviewer/res/values-in/strings.xml
hotoviewer/res/values-ja/strings.xml
hotoviewer/res/values-ko/strings.xml
hotoviewer/res/values-lt/strings.xml
hotoviewer/res/values-lv/strings.xml
hotoviewer/res/values-pt/strings.xml
hotoviewer/res/values-ro/strings.xml
hotoviewer/res/values-ru/strings.xml
hotoviewer/res/values-sk/strings.xml
hotoviewer/res/values-sl/strings.xml
hotoviewer/res/values-sr/strings.xml
hotoviewer/res/values-th/strings.xml
hotoviewer/res/values-tl/strings.xml
hotoviewer/res/values-tr/strings.xml
hotoviewer/res/values-zh-rCN/strings.xml
|
| ab1b2d10b188b7cc20696008c0eef5b0aa9db259 |
07-Aug-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: Ibb4ce7447707d7edf991109809a23890715adbd9
Auto-generated-cl: translation import
hotoviewer/res/values-af/strings.xml
hotoviewer/res/values-am/strings.xml
hotoviewer/res/values-ar/strings.xml
hotoviewer/res/values-be/strings.xml
hotoviewer/res/values-bg/strings.xml
hotoviewer/res/values-ca/strings.xml
hotoviewer/res/values-cs/strings.xml
hotoviewer/res/values-da/strings.xml
hotoviewer/res/values-de/strings.xml
hotoviewer/res/values-el/strings.xml
hotoviewer/res/values-en-rGB/strings.xml
hotoviewer/res/values-es-rUS/strings.xml
hotoviewer/res/values-es/strings.xml
hotoviewer/res/values-et/strings.xml
hotoviewer/res/values-fa/strings.xml
hotoviewer/res/values-fi/strings.xml
hotoviewer/res/values-fr/strings.xml
hotoviewer/res/values-hi/strings.xml
hotoviewer/res/values-hr/strings.xml
hotoviewer/res/values-hu/strings.xml
hotoviewer/res/values-in/strings.xml
hotoviewer/res/values-it/strings.xml
hotoviewer/res/values-iw/strings.xml
hotoviewer/res/values-ja/strings.xml
hotoviewer/res/values-ko/strings.xml
hotoviewer/res/values-lt/strings.xml
hotoviewer/res/values-lv/strings.xml
hotoviewer/res/values-ms/strings.xml
hotoviewer/res/values-nb/strings.xml
hotoviewer/res/values-nl/strings.xml
hotoviewer/res/values-pl/strings.xml
hotoviewer/res/values-pt-rPT/strings.xml
hotoviewer/res/values-pt/strings.xml
hotoviewer/res/values-ro/strings.xml
hotoviewer/res/values-ru/strings.xml
hotoviewer/res/values-sk/strings.xml
hotoviewer/res/values-sl/strings.xml
hotoviewer/res/values-sr/strings.xml
hotoviewer/res/values-sv/strings.xml
hotoviewer/res/values-sw/strings.xml
hotoviewer/res/values-th/strings.xml
hotoviewer/res/values-tl/strings.xml
hotoviewer/res/values-tr/strings.xml
hotoviewer/res/values-uk/strings.xml
hotoviewer/res/values-vi/strings.xml
hotoviewer/res/values-zh-rCN/strings.xml
hotoviewer/res/values-zh-rTW/strings.xml
hotoviewer/res/values-zu/strings.xml
|
| d78d1f424b389e26f80f73cfe2f919affec60f60 |
07-Aug-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: I40c6fb4ebfc525a6d0b6a7a14883286fab94c4da
Auto-generated-cl: translation import
hotoviewer/res/values-af/strings.xml
hotoviewer/res/values-am/strings.xml
hotoviewer/res/values-ar/strings.xml
hotoviewer/res/values-be/strings.xml
hotoviewer/res/values-bg/strings.xml
hotoviewer/res/values-ca/strings.xml
hotoviewer/res/values-cs/strings.xml
hotoviewer/res/values-da/strings.xml
hotoviewer/res/values-de/strings.xml
hotoviewer/res/values-el/strings.xml
hotoviewer/res/values-en-rGB/strings.xml
hotoviewer/res/values-es-rUS/strings.xml
hotoviewer/res/values-es/strings.xml
hotoviewer/res/values-et/strings.xml
hotoviewer/res/values-fa/strings.xml
hotoviewer/res/values-fi/strings.xml
hotoviewer/res/values-fr/strings.xml
hotoviewer/res/values-hi/strings.xml
hotoviewer/res/values-hr/strings.xml
hotoviewer/res/values-hu/strings.xml
hotoviewer/res/values-in/strings.xml
hotoviewer/res/values-it/strings.xml
hotoviewer/res/values-iw/strings.xml
hotoviewer/res/values-ja/strings.xml
hotoviewer/res/values-ko/strings.xml
hotoviewer/res/values-lt/strings.xml
hotoviewer/res/values-lv/strings.xml
hotoviewer/res/values-ms/strings.xml
hotoviewer/res/values-nb/strings.xml
hotoviewer/res/values-nl/strings.xml
hotoviewer/res/values-pl/strings.xml
hotoviewer/res/values-pt-rPT/strings.xml
hotoviewer/res/values-pt/strings.xml
hotoviewer/res/values-ro/strings.xml
hotoviewer/res/values-ru/strings.xml
hotoviewer/res/values-sk/strings.xml
hotoviewer/res/values-sl/strings.xml
hotoviewer/res/values-sr/strings.xml
hotoviewer/res/values-sv/strings.xml
hotoviewer/res/values-sw/strings.xml
hotoviewer/res/values-th/strings.xml
hotoviewer/res/values-tl/strings.xml
hotoviewer/res/values-tr/strings.xml
hotoviewer/res/values-uk/strings.xml
hotoviewer/res/values-vi/strings.xml
hotoviewer/res/values-zh-rCN/strings.xml
hotoviewer/res/values-zh-rTW/strings.xml
hotoviewer/res/values-zu/strings.xml
|
| c9d8f17aedc7cee1052cdffd3e0f027b4ea75803 |
07-Aug-2012 |
Andrew Sapperstein <asapperstein@google.com> |
am 242b8c8d: am 47363d13: am 76aca5f8: Made title and subtitle not show immediately.
* commit '242b8c8d801aeca5ccd3b01bc4cf5e648cd4e8b9':
Made title and subtitle not show immediately.
|
| 242b8c8d801aeca5ccd3b01bc4cf5e648cd4e8b9 |
07-Aug-2012 |
Andrew Sapperstein <asapperstein@google.com> |
am 47363d13: am 76aca5f8: Made title and subtitle not show immediately.
* commit '47363d13d70c521c699551b13e691486e37fa19d':
Made title and subtitle not show immediately.
|
| 47363d13d70c521c699551b13e691486e37fa19d |
07-Aug-2012 |
Andrew Sapperstein <asapperstein@google.com> |
am 76aca5f8: Made title and subtitle not show immediately.
* commit '76aca5f8ae1a795aa4f351209a41545b6b3ade6e':
Made title and subtitle not show immediately.
|
| 76aca5f8ae1a795aa4f351209a41545b6b3ade6e |
07-Aug-2012 |
Andrew Sapperstein <asapperstein@google.com> |
Made title and subtitle not show immediately.
Fixes an issue where we used to show the app title
for an instant before getting the data for the photo.
Now we show nothing until we have the photo data.
Change-Id: I2a77b18af2ec2051848c188e0dad7ca04be4f285
hotoviewer/src/com/android/ex/photo/Intents.java
hotoviewer/src/com/android/ex/photo/PhotoViewActivity.java
hotoviewer/src/com/android/ex/photo/adapters/PhotoPagerAdapter.java
|
| 5ec8529e749d623eb1c2fcb8fb266ef68cbcf271 |
07-Aug-2012 |
Andrew Sapperstein <asapperstein@google.com> |
am 3b17ff22: am 0e6b5436: am 9730472b: Fix Build.
* commit '3b17ff22c7a39008a1efab1c81be2e22c430d2cd':
Fix Build.
|
| 3b17ff22c7a39008a1efab1c81be2e22c430d2cd |
07-Aug-2012 |
Andrew Sapperstein <asapperstein@google.com> |
am 0e6b5436: am 9730472b: Fix Build.
* commit '0e6b5436df6d58238910d5666838e732f016cf29':
Fix Build.
|
| 0e6b5436df6d58238910d5666838e732f016cf29 |
07-Aug-2012 |
Andrew Sapperstein <asapperstein@google.com> |
am 9730472b: Fix Build.
* commit '9730472b92d267fc40347987b13e16c967d5d956':
Fix Build.
|
| 9730472b92d267fc40347987b13e16c967d5d956 |
07-Aug-2012 |
Andrew Sapperstein <asapperstein@google.com> |
Fix Build.
Change-Id: If36065612faadc4d6b44ddbfc9efde0597db4718
hotoviewer/src/com/android/ex/photo/PhotoViewActivity.java
|
| f292c4579c2a8c672466d82ba1278c8ad108ac1e |
07-Aug-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
| 569dbbe73b0e5aa63032e825e130f45f7406a3df |
06-Aug-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am dcb21eed: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit 'dcb21eedaacb836aa22fc645c3d793e5e654cf8a':
|
| dcb21eedaacb836aa22fc645c3d793e5e654cf8a |
06-Aug-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr1-release - do not merge
Change-Id: I8066ff383d20a76d329f445aa7e2420e275ab1f6
|
| 45f209ed039da5e5d45e62e7f000db27b5b31e50 |
06-Aug-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: I0289ca5cee6435fcf2db8bd80238e1ad0751a7a4
Auto-generated-cl: translation import
hotoviewer/res/values-af/strings.xml
hotoviewer/res/values-am/strings.xml
hotoviewer/res/values-ar/strings.xml
hotoviewer/res/values-be/strings.xml
hotoviewer/res/values-bg/strings.xml
hotoviewer/res/values-ca/strings.xml
hotoviewer/res/values-cs/strings.xml
hotoviewer/res/values-da/strings.xml
hotoviewer/res/values-de/strings.xml
hotoviewer/res/values-el/strings.xml
hotoviewer/res/values-en-rGB/strings.xml
hotoviewer/res/values-es-rUS/strings.xml
hotoviewer/res/values-es/strings.xml
hotoviewer/res/values-et/strings.xml
hotoviewer/res/values-fa/strings.xml
hotoviewer/res/values-fi/strings.xml
hotoviewer/res/values-fr/strings.xml
hotoviewer/res/values-hi/strings.xml
hotoviewer/res/values-hr/strings.xml
hotoviewer/res/values-hu/strings.xml
hotoviewer/res/values-in/strings.xml
hotoviewer/res/values-it/strings.xml
hotoviewer/res/values-iw/strings.xml
hotoviewer/res/values-ja/strings.xml
hotoviewer/res/values-ko/strings.xml
hotoviewer/res/values-lt/strings.xml
hotoviewer/res/values-lv/strings.xml
hotoviewer/res/values-ms/strings.xml
hotoviewer/res/values-nb/strings.xml
hotoviewer/res/values-nl/strings.xml
hotoviewer/res/values-pl/strings.xml
hotoviewer/res/values-pt-rPT/strings.xml
hotoviewer/res/values-pt/strings.xml
hotoviewer/res/values-ro/strings.xml
hotoviewer/res/values-ru/strings.xml
hotoviewer/res/values-sk/strings.xml
hotoviewer/res/values-sl/strings.xml
hotoviewer/res/values-sr/strings.xml
hotoviewer/res/values-sv/strings.xml
hotoviewer/res/values-sw/strings.xml
hotoviewer/res/values-th/strings.xml
hotoviewer/res/values-tl/strings.xml
hotoviewer/res/values-tr/strings.xml
hotoviewer/res/values-uk/strings.xml
hotoviewer/res/values-vi/strings.xml
hotoviewer/res/values-zh-rCN/strings.xml
hotoviewer/res/values-zh-rTW/strings.xml
hotoviewer/res/values-zu/strings.xml
|
| 59dfe0f13035e0a47ab832b3fde8ab7f8dc4f904 |
06-Aug-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| bfb5158be175ed3a5111706906da69fc29eaa6d2 |
04-Aug-2012 |
Andrew Sapperstein <asapperstein@google.com> |
am 7f030328: am 992b418d: am 509bd03a: Enabled optional support for showing progress.
* commit '7f030328e7e71b14a379b4f67689b76be249d33d':
Enabled optional support for showing progress.
|
| 7f030328e7e71b14a379b4f67689b76be249d33d |
04-Aug-2012 |
Andrew Sapperstein <asapperstein@google.com> |
am 992b418d: am 509bd03a: Enabled optional support for showing progress.
* commit '992b418d2219b846a47763923d67e865d0aab0ed':
Enabled optional support for showing progress.
|
| 992b418d2219b846a47763923d67e865d0aab0ed |
04-Aug-2012 |
Andrew Sapperstein <asapperstein@google.com> |
am 509bd03a: Enabled optional support for showing progress.
* commit '509bd03a2a783f804e9456767b52e0f8ef43479b':
Enabled optional support for showing progress.
|
| 509bd03a2a783f804e9456767b52e0f8ef43479b |
03-Aug-2012 |
Andrew Sapperstein <asapperstein@google.com> |
Enabled optional support for showing progress.
Added some progress bars to the "empty" view
so that implementors of the API can show the
progress of things like downloads or loading.
Additionally, added a retry button and an optional
text that allows you to indicate status to the user.
Due to a bug in the framework, we actually use two
progress bars (one determinate and one indeterminate)
to update our status. Created a wrapper that allows
the controlling of both progress bars in sync.
Change-Id: I710e06317948d376d445abf1603545982ac8479d
hotoviewer/res/drawable-hdpi/ic_menu_refresh_holo_dark.png
hotoviewer/res/drawable-mdpi/ic_menu_refresh_holo_dark.png
hotoviewer/res/drawable-xhdpi/ic_menu_refresh_holo_dark.png
hotoviewer/res/layout/photo_fragment_view.xml
hotoviewer/res/values/dimen.xml
hotoviewer/res/values/strings.xml
hotoviewer/src/com/android/ex/photo/PhotoViewActivity.java
hotoviewer/src/com/android/ex/photo/fragments/PhotoViewFragment.java
hotoviewer/src/com/android/ex/photo/views/ProgressBarWrapper.java
|
| 7900bb1c25bbb42c310421abd385e9be857a9bd4 |
01-Aug-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am e0b4f006: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit 'e0b4f006f7c1dc516b7949c8fd3ee7f1ab2023b2':
|
| e0b4f006f7c1dc516b7949c8fd3ee7f1ab2023b2 |
01-Aug-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr1-release - do not merge
Change-Id: I0f8daf360787b971d88ea9db56f38c9df9a573e1
|
| b089ef98cb494c217e56703c4fcbba7b48c84792 |
31-Jul-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Recover changes from jb-mr1-dev
Change-Id: I64acaaedf5f6fd689c0bddcbf26d9eaa66a8f287
hotoviewer/res/drawable/default_image.png
hotoviewer/res/layout/photo_fragment_view.xml
hotoviewer/src/com/android/ex/photo/Intents.java
hotoviewer/src/com/android/ex/photo/PhotoViewActivity.java
hotoviewer/src/com/android/ex/photo/PhotoViewPager.java
hotoviewer/src/com/android/ex/photo/adapters/PhotoPagerAdapter.java
hotoviewer/src/com/android/ex/photo/fragments/PhotoViewFragment.java
hotoviewer/src/com/android/ex/photo/util/ImageUtils.java
|
| 8d05502c0d3204fc73911de979e083b822c78091 |
31-Jul-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| 914bc6d5fc30b2e42b037c32bae37684df67682a |
31-Jul-2012 |
Andrew Sapperstein <asapperstein@google.com> |
am c53eac04: am b81f8c96: ActionBar now auto-hides like Gallery\'s version.
* commit 'c53eac049566d3c573aa62d6fd5a7e01db17a443':
ActionBar now auto-hides like Gallery's version.
|
| 0ffe36f0b9e40bd3d82562cef8acb7f9ee0c5e1c |
31-Jul-2012 |
The Android Automerger <android-build@android.com> |
am 8e11aa50: Merge remote-tracking branch \'goog/jb-ub-mail\' into jb-mr1-dev
* commit '8e11aa50c010fca5e9f205df8e20606dfbd7f791':
|
| c53eac049566d3c573aa62d6fd5a7e01db17a443 |
31-Jul-2012 |
Andrew Sapperstein <asapperstein@google.com> |
am b81f8c96: ActionBar now auto-hides like Gallery\'s version.
* commit 'b81f8c963a0d97034872f14f4e2294d1e2b44da1':
ActionBar now auto-hides like Gallery's version.
|
| b81f8c963a0d97034872f14f4e2294d1e2b44da1 |
30-Jul-2012 |
Andrew Sapperstein <asapperstein@google.com> |
ActionBar now auto-hides like Gallery's version.
5 second delay from opened. Will not hide on first
appearance. Has be closed and re-opened. Also,
eliminated the progress spinner when the photo hadn't
yet loaded.
Additionally, modified the action bar to match gallery's
transparency.
Change-Id: I69e72d787bc2cda9c18df6a9cf1800d155d6876a
hotoviewer/res/drawable-hdpi/actionbar_translucent.9.png
hotoviewer/res/drawable-mdpi/actionbar_translucent.9.png
hotoviewer/res/layout/photo_activity_view.xml
hotoviewer/res/values/constants.xml
hotoviewer/res/values/themes.xml
hotoviewer/src/com/android/ex/photo/PhotoViewActivity.java
hotoviewer/src/com/android/ex/photo/fragments/PhotoViewFragment.java
|
| 8e11aa50c010fca5e9f205df8e20606dfbd7f791 |
31-Jul-2012 |
The Android Automerger <android-build@android.com> |
Merge remote-tracking branch 'goog/jb-ub-mail' into jb-mr1-dev
|
| 2f3508b9d76c99f3a99256f53009e5eced6ccbf2 |
31-Jul-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr1-release
Change-Id: Id04dc368f1e0a6675c5874bc0664c29ddcc72415
|
| 02497a60c4aa8de55be24996baf9977ca1b03b3c |
30-Jul-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| 2782b1a866c3fa1e7d96c3ceb691becefabf51d8 |
28-Jul-2012 |
Andrew Sapperstein <asapperstein@google.com> |
am 9a7b600e: Fixes a bug where scaling would not be performed.
* commit '9a7b600e8bd26ed0a0095f62fb405e67d2f47834':
Fixes a bug where scaling would not be performed.
|
| 9a7b600e8bd26ed0a0095f62fb405e67d2f47834 |
28-Jul-2012 |
Andrew Sapperstein <asapperstein@google.com> |
Fixes a bug where scaling would not be performed.
Had to add an additional case to the page transform
that handles the new issue where the just disappeared
view is actually behind the screen but still getting
touch events. Victory.
Change-Id: Ifb760fd7d7510fec37c4101d448dbc980575b1be
hotoviewer/src/com/android/ex/photo/PhotoViewPager.java
|
| 40a3c7315d7b1c61432f4fb6f11da67c25fada4c |
27-Jul-2012 |
Andrew Sapperstein <asapperstein@google.com> |
am 8085e1fc: Partial fix of 6890014.
* commit '8085e1fcda882074ed387d3e999c448a84d6eb3b':
Partial fix of 6890014.
|
| 8085e1fcda882074ed387d3e999c448a84d6eb3b |
27-Jul-2012 |
Andrew Sapperstein <asapperstein@google.com> |
Partial fix of 6890014.
No longer crashing. But the attachment is now
in a very weird state.
Change-Id: If688d9c19a81124cbd1ecd0266821800f76f3c74
hotoviewer/src/com/android/ex/photo/Intents.java
hotoviewer/src/com/android/ex/photo/adapters/PhotoPagerAdapter.java
hotoviewer/src/com/android/ex/photo/util/ImageUtils.java
|
| d0fa3e12d834e716d612619a234123b058467f1b |
27-Jul-2012 |
Andrew Sapperstein <asapperstein@google.com> |
am 9ceb1b41: Showing a default preview photo.
* commit '9ceb1b41122f649cd26234f34edc2c1cf75b2f95':
Showing a default preview photo.
|
| 9ceb1b41122f649cd26234f34edc2c1cf75b2f95 |
27-Jul-2012 |
Andrew Sapperstein <asapperstein@google.com> |
Showing a default preview photo.
If we do not have a preview and are currently
waiting on a full photo, we will show a stock
photo. Currently shows a grey box as we do not
have assets yet.
Change-Id: I155071598b20bf81b2b60bdd8ac881a64b8ee1b7
hotoviewer/res/drawable/default_image.png
hotoviewer/res/layout/photo_fragment_view.xml
hotoviewer/src/com/android/ex/photo/PhotoViewActivity.java
hotoviewer/src/com/android/ex/photo/fragments/PhotoViewFragment.java
|
| 905bd0bc52f78cc08eb01de9d702c5b5a934c56f |
25-Jul-2012 |
Andrew Sapperstein <asapperstein@google.com> |
am ebeb8b01: Finalized the photo viewer transitions.
* commit 'ebeb8b01ee3719f86d3ad96a0f0603032efbc1dc':
Finalized the photo viewer transitions.
|
| ebeb8b01ee3719f86d3ad96a0f0603032efbc1dc |
25-Jul-2012 |
Andrew Sapperstein <asapperstein@google.com> |
Finalized the photo viewer transitions.
Changed the black background to be on the
FrameLayout behind the view pager rather than
on the the photo view. Also deleted some dead code.
Change-Id: I19759d3f7e93c32b6c6aceda0c296610f90f20f7
hotoviewer/res/drawable/photo_view_background.xml
hotoviewer/res/layout/photo_activity_view.xml
hotoviewer/res/layout/photo_fragment_view.xml
hotoviewer/res/values/colors.xml
hotoviewer/res/values/themes.xml
hotoviewer/src/com/android/ex/photo/views/PhotoView.java
|
| 9221219c5cca2cd8d6f85d3a3280a637e4e8e9af |
25-Jul-2012 |
Andrew Sapperstein <asapperstein@google.com> |
am 749602e6: Added transitions to photo viewer.
* commit '749602e643c76f981e1db26198876d103008b5e7':
Added transitions to photo viewer.
|
| 749602e643c76f981e1db26198876d103008b5e7 |
25-Jul-2012 |
Andrew Sapperstein <asapperstein@google.com> |
Added transitions to photo viewer.
Change-Id: Ie3c9a36019e161cf0f7b32cfbeba4749ef5ccfd8
hotoviewer/src/com/android/ex/photo/PhotoViewPager.java
|
| 0696ad2f9cbf2a1d478aedb52e055ce41b371fcb |
24-Jul-2012 |
Andrew Sapperstein <asapperstein@google.com> |
am d19540fb: Support showing previews in the photo viewer.
* commit 'd19540fb7139fc0baba3b55260a6aabdb029c831':
Support showing previews in the photo viewer.
|
| d19540fb7139fc0baba3b55260a6aabdb029c831 |
24-Jul-2012 |
Andrew Sapperstein <asapperstein@google.com> |
Support showing previews in the photo viewer.
The photo viewer now supports the notion of a
preview of the full image. The preview is not
pinchable in any manner and displays a circular
progress bar over top of it while we are downloading
the full version of the image.
To enable this functionality, there is a new column
in the PhotoContract API called thumbnailUri. If it is
not set to null and if the attempted load of the contentUri
is unsuccessful, we will attempt to load a thumbnail version
that will show until the contentUri is finished loading.
Change-Id: I5547a5fc6a30ee6a30f137dc1dee76a77fb5b304
hotoviewer/src/com/android/ex/photo/Intents.java
hotoviewer/src/com/android/ex/photo/adapters/PhotoPagerAdapter.java
hotoviewer/src/com/android/ex/photo/fragments/PhotoViewFragment.java
hotoviewer/src/com/android/ex/photo/provider/PhotoContract.java
hotoviewer/src/com/android/ex/photo/views/PhotoView.java
|
| 8e12a30b395006d3c0b538f5ed92fc4f46d70c48 |
23-Jul-2012 |
Andrew Sapperstein <asapperstein@google.com> |
am a6729336: Reloading bitmaps if cursor updates.
* commit 'a6729336171ef61950d5f585b0f39c013ae6dcbc':
Reloading bitmaps if cursor updates.
|
| a6729336171ef61950d5f585b0f39c013ae6dcbc |
21-Jul-2012 |
Andrew Sapperstein <asapperstein@google.com> |
Reloading bitmaps if cursor updates.
Change-Id: I5624e533d4f35255028cd1a31508dabdb33dfe7f
hotoviewer/res/layout/photo_activity_view.xml
hotoviewer/res/layout/photo_fragment_view.xml
hotoviewer/src/com/android/ex/photo/PhotoViewActivity.java
hotoviewer/src/com/android/ex/photo/adapters/BaseCursorPagerAdapter.java
hotoviewer/src/com/android/ex/photo/adapters/PhotoPagerAdapter.java
hotoviewer/src/com/android/ex/photo/fragments/PhotoViewFragment.java
hotoviewer/src/com/android/ex/photo/loaders/PhotoBitmapLoader.java
|
| 3c9d05d3df6509083f2b3abc11ab35d29e2c7a1d |
16-Jul-2012 |
Mindy Pereira <mindyp@google.com> |
Merge commit 'a9721f38' into manualmerge
Conflicts:
chips/src/com/android/ex/chips/RecipientEditTextView.java
Change-Id: I9df74d47073a1fc11ba2d59ef66bbef1f2bd732e
|
| a9721f38340e84806b8ffae28b858b689892f7c0 |
16-Jul-2012 |
Mindy Pereira <mindyp@google.com> |
Merge change from jb-dev to master
This is the change that fixes the random scrolling when switching
between reply/reply all
Merge of: https://android-git.corp.google.com/g/#/c/203483/1
Change-Id: I6b11016b4f48b297a2c6c40413cf6d6a52a193b4
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 229402d7d90b2dfb75806e551f0c452435030c11 |
13-Jul-2012 |
Ying Wang <wangying@google.com> |
am c1938921: (-s ours) Import translations. DO NOT MERGE
* commit 'c1938921e592a6ee74675b751289017232f2c486':
Import translations. DO NOT MERGE
|
| 21eba67108aa1ff40d974c0bde782e87c6e9a0ee |
13-Jul-2012 |
Ying Wang <wangying@google.com> |
Import translations. DO NOT MERGE
Change-Id: Id27c1e5a3d49f4d0e27e58ec7d6613790e9c2c4e
Auto-generated-cl: translation import
hips/res/values-af/strings.xml
hips/res/values-ms/strings.xml
hips/res/values-pl/strings.xml
hips/res/values-pt/strings.xml
hips/res/values-zh-rCN/strings.xml
hotoviewer/res/values-fa/strings.xml
|
| c1938921e592a6ee74675b751289017232f2c486 |
13-Jul-2012 |
Ying Wang <wangying@google.com> |
Import translations. DO NOT MERGE
Change-Id: I63a6ae5791be411633854b5aceafdb078762d21b
Auto-generated-cl: translation import
hips/res/values-af/strings.xml
hips/res/values-ms/strings.xml
hips/res/values-pl/strings.xml
hips/res/values-pt/strings.xml
hips/res/values-zh-rCN/strings.xml
hotoviewer/res/values-fa/strings.xml
|
| 6803e708716f80cfb47b8f8ab44ef9cba2a66138 |
12-Jul-2012 |
Ying Wang <wangying@google.com> |
am fe383816: (-s ours) Import translations. DO NOT MERGE
* commit 'fe38381637dffbb1483ddc6ca6c07ed0a1fb90fd':
Import translations. DO NOT MERGE
|
| aec56fae5ec0764ca2a1b4fbd18a498455a06f6f |
12-Jul-2012 |
Ying Wang <wangying@google.com> |
Import translations. DO NOT MERGE
Change-Id: Iaa3c2995b7bf99bd1572e7bad7beee7cc5bdfc41
Auto-generated-cl: translation import
hips/res/values-ar/strings.xml
hips/res/values-be/strings.xml
hips/res/values-bg/strings.xml
hips/res/values-ca/strings.xml
hips/res/values-en-rGB/strings.xml
hips/res/values-es-rUS/strings.xml
hips/res/values-et/strings.xml
hips/res/values-fa/strings.xml
hips/res/values-fi/strings.xml
hips/res/values-fr/strings.xml
hips/res/values-hi/strings.xml
hips/res/values-in/strings.xml
hips/res/values-ja/strings.xml
hips/res/values-ko/strings.xml
hips/res/values-lt/strings.xml
hips/res/values-lv/strings.xml
hips/res/values-nb/strings.xml
hips/res/values-pt-rPT/strings.xml
hips/res/values-ro/strings.xml
hips/res/values-ru/strings.xml
hips/res/values-sk/strings.xml
hips/res/values-sl/strings.xml
hips/res/values-th/strings.xml
hips/res/values-tl/strings.xml
hips/res/values-tr/strings.xml
hips/res/values-uk/strings.xml
hips/res/values-vi/strings.xml
hips/res/values-zh-rTW/strings.xml
hips/res/values-zu/strings.xml
|
| fe38381637dffbb1483ddc6ca6c07ed0a1fb90fd |
12-Jul-2012 |
Ying Wang <wangying@google.com> |
Import translations. DO NOT MERGE
Change-Id: I942013958098aa904d57cc8f395d46ae69baba08
Auto-generated-cl: translation import
hips/res/values-ar/strings.xml
hips/res/values-be/strings.xml
hips/res/values-bg/strings.xml
hips/res/values-ca/strings.xml
hips/res/values-en-rGB/strings.xml
hips/res/values-es-rUS/strings.xml
hips/res/values-et/strings.xml
hips/res/values-fa/strings.xml
hips/res/values-fi/strings.xml
hips/res/values-fr/strings.xml
hips/res/values-hi/strings.xml
hips/res/values-in/strings.xml
hips/res/values-ja/strings.xml
hips/res/values-ko/strings.xml
hips/res/values-lt/strings.xml
hips/res/values-lv/strings.xml
hips/res/values-nb/strings.xml
hips/res/values-pt-rPT/strings.xml
hips/res/values-ro/strings.xml
hips/res/values-ru/strings.xml
hips/res/values-sk/strings.xml
hips/res/values-sl/strings.xml
hips/res/values-th/strings.xml
hips/res/values-tl/strings.xml
hips/res/values-tr/strings.xml
hips/res/values-uk/strings.xml
hips/res/values-vi/strings.xml
hips/res/values-zh-rTW/strings.xml
hips/res/values-zu/strings.xml
|
| 3697678709d3464ba8b719763886717709b864bd |
12-Jul-2012 |
Ying Wang <wangying@google.com> |
am 70b2d5b8: (-s ours) Import translations. DO NOT MERGE
* commit '70b2d5b823b8e6cc693167972c0970d6e47700ab':
Import translations. DO NOT MERGE
|
| fdeac25e3d86f615c38a2738b39bdc60e198b7eb |
11-Jul-2012 |
Ying Wang <wangying@google.com> |
Import translations. DO NOT MERGE
Change-Id: Ie0eba8c9a63042e717babf6047ae062845326e08
Auto-generated-cl: translation import
hips/res/values-af/strings.xml
hips/res/values-am/strings.xml
hips/res/values-ar/strings.xml
hips/res/values-be/strings.xml
hips/res/values-bg/strings.xml
hips/res/values-ca/strings.xml
hips/res/values-cs/strings.xml
hips/res/values-da/strings.xml
hips/res/values-de/strings.xml
hips/res/values-el/strings.xml
hips/res/values-en-rGB/strings.xml
hips/res/values-es-rUS/strings.xml
hips/res/values-es/strings.xml
hips/res/values-et/strings.xml
hips/res/values-fa/strings.xml
hips/res/values-fi/strings.xml
hips/res/values-fr/strings.xml
hips/res/values-hi/strings.xml
hips/res/values-hr/strings.xml
hips/res/values-hu/strings.xml
hips/res/values-in/strings.xml
hips/res/values-it/strings.xml
hips/res/values-iw/strings.xml
hips/res/values-ja/strings.xml
hips/res/values-ko/strings.xml
hips/res/values-lt/strings.xml
hips/res/values-lv/strings.xml
hips/res/values-ms/strings.xml
hips/res/values-nb/strings.xml
hips/res/values-nl/strings.xml
hips/res/values-pl/strings.xml
hips/res/values-pt-rPT/strings.xml
hips/res/values-pt/strings.xml
hips/res/values-ro/strings.xml
hips/res/values-ru/strings.xml
hips/res/values-sk/strings.xml
hips/res/values-sl/strings.xml
hips/res/values-sr/strings.xml
hips/res/values-sv/strings.xml
hips/res/values-sw/strings.xml
hips/res/values-th/strings.xml
hips/res/values-tl/strings.xml
hips/res/values-tr/strings.xml
hips/res/values-uk/strings.xml
hips/res/values-vi/strings.xml
hips/res/values-zh-rCN/strings.xml
hips/res/values-zh-rTW/strings.xml
hips/res/values-zu/strings.xml
|
| 70b2d5b823b8e6cc693167972c0970d6e47700ab |
11-Jul-2012 |
Ying Wang <wangying@google.com> |
Import translations. DO NOT MERGE
Change-Id: I00207950eefe71a7e82e3b3b47131bb2338c7035
Auto-generated-cl: translation import
hips/res/values-af/strings.xml
hips/res/values-am/strings.xml
hips/res/values-ar/strings.xml
hips/res/values-be/strings.xml
hips/res/values-bg/strings.xml
hips/res/values-ca/strings.xml
hips/res/values-cs/strings.xml
hips/res/values-da/strings.xml
hips/res/values-de/strings.xml
hips/res/values-el/strings.xml
hips/res/values-en-rGB/strings.xml
hips/res/values-es-rUS/strings.xml
hips/res/values-es/strings.xml
hips/res/values-et/strings.xml
hips/res/values-fa/strings.xml
hips/res/values-fi/strings.xml
hips/res/values-fr/strings.xml
hips/res/values-hi/strings.xml
hips/res/values-hr/strings.xml
hips/res/values-hu/strings.xml
hips/res/values-in/strings.xml
hips/res/values-it/strings.xml
hips/res/values-iw/strings.xml
hips/res/values-ja/strings.xml
hips/res/values-ko/strings.xml
hips/res/values-lt/strings.xml
hips/res/values-lv/strings.xml
hips/res/values-ms/strings.xml
hips/res/values-nb/strings.xml
hips/res/values-nl/strings.xml
hips/res/values-pl/strings.xml
hips/res/values-pt-rPT/strings.xml
hips/res/values-pt/strings.xml
hips/res/values-ro/strings.xml
hips/res/values-ru/strings.xml
hips/res/values-sk/strings.xml
hips/res/values-sl/strings.xml
hips/res/values-sr/strings.xml
hips/res/values-sv/strings.xml
hips/res/values-sw/strings.xml
hips/res/values-th/strings.xml
hips/res/values-tl/strings.xml
hips/res/values-tr/strings.xml
hips/res/values-uk/strings.xml
hips/res/values-vi/strings.xml
hips/res/values-zh-rCN/strings.xml
hips/res/values-zh-rTW/strings.xml
hips/res/values-zu/strings.xml
|
| d46330e7d5629577da47d943d002215536497c1f |
11-Jul-2012 |
Mindy Pereira <mindyp@google.com> |
am 030a01d3: Change # more to +#
* commit '030a01d308c0e960be4b1c7551fc1db4904f68f1':
Change # more to +#
|
| 030a01d308c0e960be4b1c7551fc1db4904f68f1 |
11-Jul-2012 |
Mindy Pereira <mindyp@google.com> |
Change # more to +#
Part of b/6801151 Improvements to chips for gmail
Change-Id: Iaa447404be250eccc33e91e9abdfeafec73354af
hips/res/values/strings.xml
|
| e2447d7508657a10ab430b1ca43562c9a0babf1b |
09-Jul-2012 |
Ying Wang <wangying@google.com> |
am feabcf2c: (-s ours) Import translations. DO NOT MERGE
* commit 'feabcf2cf0dd85990e30c7a77ce44259c7d3ed17':
Import translations. DO NOT MERGE
|
| f01ff89a7362a3df5ebdb4275edf42df7fe92b69 |
09-Jul-2012 |
Ying Wang <wangying@google.com> |
Import translations. DO NOT MERGE
Change-Id: Icf989d4778babb5efe66daf92cf2533213ad2923
Auto-generated-cl: translation import
hotoviewer/res/values-af/strings.xml
hotoviewer/res/values-sw/strings.xml
hotoviewer/res/values-zh-rTW/strings.xml
|
| feabcf2cf0dd85990e30c7a77ce44259c7d3ed17 |
09-Jul-2012 |
Ying Wang <wangying@google.com> |
Import translations. DO NOT MERGE
Change-Id: I0573c5d15cee5ea742e76fab1180b7370ff0f6b2
Auto-generated-cl: translation import
hotoviewer/res/values-af/strings.xml
hotoviewer/res/values-sw/strings.xml
hotoviewer/res/values-zh-rTW/strings.xml
|
| 1d550e8a13fc70994ed68aaad003e12fa2d00e65 |
04-Jul-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Initialize requested interfaces array"
|
| cd961432e31018599e107ef7bc008fd28d70b0c7 |
03-Jul-2012 |
Glenn Kasten <gkasten@google.com> |
Initialize requested interfaces array
Bug: 6768181
Change-Id: Ic8ca44594aea8a0e50740fe69270464ccdd7da6c
ariablespeed/jni/variablespeed.cc
|
| 328806e71a51312d0853e85c1843e61f90c37e64 |
03-Jul-2012 |
Ying Wang <wangying@google.com> |
am a8c7b090: (-s ours) Import translations. DO NOT MERGE
* commit 'a8c7b0905a068e1e7c81154476e281d0aea4ea07':
Import translations. DO NOT MERGE
|
| 0baa28988126f29b52a1167f41080afc71a70659 |
03-Jul-2012 |
Ying Wang <wangying@google.com> |
Import translations. DO NOT MERGE
Change-Id: I4d143c8f57c5359dd570d2ffd2a4a1470dea8650
Auto-generated-cl: translation import
hotoviewer/res/values-es-rUS/strings.xml
hotoviewer/res/values-ms/strings.xml
|
| a8c7b0905a068e1e7c81154476e281d0aea4ea07 |
03-Jul-2012 |
Ying Wang <wangying@google.com> |
Import translations. DO NOT MERGE
Change-Id: Ieb61e2c54d4e017b68bb99783bfbbc8909774977
Auto-generated-cl: translation import
hotoviewer/res/values-es-rUS/strings.xml
hotoviewer/res/values-ms/strings.xml
|
| 24c0412fd110566d1e010f92b954e5be219cfe1f |
02-Jul-2012 |
Eric Fischer <enf@google.com> |
am d285f704: (-s ours) Import translations. DO NOT MERGE
* commit 'd285f704e24b4cf9e8f5d54889640be9d7d24cf5':
Import translations. DO NOT MERGE
|
| f83f94d870288fd9f4a8d8dcda611c98325af942 |
02-Jul-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE
Change-Id: I28d128f312b13c6ceca593abdf681f5436932d9d
Auto-generated-cl: translation import
hotoviewer/res/values-ca/strings.xml
hotoviewer/res/values-ja/strings.xml
|
| d285f704e24b4cf9e8f5d54889640be9d7d24cf5 |
02-Jul-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE
Change-Id: I0ce0c10be5638276aa9b818dae0dc218da20f672
Auto-generated-cl: translation import
hotoviewer/res/values-ca/strings.xml
hotoviewer/res/values-ja/strings.xml
|
| 9da48f7acdbeb1383a5d0abb1a548584ad14d9c2 |
30-Jun-2012 |
Ying Wang <wangying@google.com> |
am 19d57573: (-s ours) Import translations. DO NOT MERGE
* commit '19d57573c015b06b095216e6830388587e44ec37':
Import translations. DO NOT MERGE
|
| 51e3b3fecc627ac379b38ee5a0edff09bd73b48b |
29-Jun-2012 |
Ying Wang <wangying@google.com> |
Import translations. DO NOT MERGE
Change-Id: Ife03538141055aad0aa5dc2eb2b83e95e955f325
Auto-generated-cl: translation import
hotoviewer/res/values-am/strings.xml
hotoviewer/res/values-bg/strings.xml
hotoviewer/res/values-es-rUS/strings.xml
hotoviewer/res/values-es/strings.xml
hotoviewer/res/values-et/strings.xml
hotoviewer/res/values-fa/strings.xml
hotoviewer/res/values-hr/strings.xml
hotoviewer/res/values-ko/strings.xml
hotoviewer/res/values-lt/strings.xml
hotoviewer/res/values-lv/strings.xml
hotoviewer/res/values-nb/strings.xml
hotoviewer/res/values-pt/strings.xml
hotoviewer/res/values-ro/strings.xml
hotoviewer/res/values-sl/strings.xml
hotoviewer/res/values-sr/strings.xml
hotoviewer/res/values-uk/strings.xml
hotoviewer/res/values-vi/strings.xml
hotoviewer/res/values-zu/strings.xml
|
| 19d57573c015b06b095216e6830388587e44ec37 |
29-Jun-2012 |
Ying Wang <wangying@google.com> |
Import translations. DO NOT MERGE
Change-Id: I3b52620101e5cc70e113115daca365854aa492d1
Auto-generated-cl: translation import
hotoviewer/res/values-am/strings.xml
hotoviewer/res/values-bg/strings.xml
hotoviewer/res/values-es-rUS/strings.xml
hotoviewer/res/values-es/strings.xml
hotoviewer/res/values-et/strings.xml
hotoviewer/res/values-fa/strings.xml
hotoviewer/res/values-hr/strings.xml
hotoviewer/res/values-ko/strings.xml
hotoviewer/res/values-lt/strings.xml
hotoviewer/res/values-lv/strings.xml
hotoviewer/res/values-nb/strings.xml
hotoviewer/res/values-pt/strings.xml
hotoviewer/res/values-ro/strings.xml
hotoviewer/res/values-sl/strings.xml
hotoviewer/res/values-sr/strings.xml
hotoviewer/res/values-uk/strings.xml
hotoviewer/res/values-vi/strings.xml
hotoviewer/res/values-zu/strings.xml
|
| d6a184a312fd4cb1ecff104da54e87b72f75fde4 |
29-Jun-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 53a30410: Reconcile with jb-release
* commit '53a304102f3c0509feaf22bb9c717e5216a45150':
|
| 53a304102f3c0509feaf22bb9c717e5216a45150 |
29-Jun-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-release
Change-Id: I310d0ebe5267d9e6915ffa4ea1a629fda57dd53a
|
| baf8a009b7ef1f1c95da572605dbc34296ea28b9 |
28-Jun-2012 |
Eric Fischer <enf@google.com> |
am e8db3a2f: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail
* commit 'e8db3a2fd818346fc16e9dd8be033c1b192a9815':
Import translations. DO NOT MERGE
|
| 23d6f4d56d905d5377f6ceff4f2c0747343cf667 |
28-Jun-2012 |
Mindy Pereira <mindyp@google.com> |
am 1a71f76d: Check for null adapter.
* commit '1a71f76db0880a572b1443e8a0ac31a4bb584a8b':
Check for null adapter.
|
| e8db3a2fd818346fc16e9dd8be033c1b192a9815 |
28-Jun-2012 |
Eric Fischer <enf@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-ub-mail
|
| 1a71f76db0880a572b1443e8a0ac31a4bb584a8b |
28-Jun-2012 |
Mindy Pereira <mindyp@google.com> |
Check for null adapter.
If its not set, that would cause this crash in the monkey.
Fixes b/6746348 java.lang.NullPointerException at com.android.ex.chips.RecipientEditTextView.isPhoneQuery(RecipientEditTextView.java:2574)
Change-Id: I420bbae15180d0d53c674b00907bc361a519c165
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| bf7b74a6acfad0e818aeba77841a1313c109c98f |
28-Jun-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE
Change-Id: Id8a82eb18f1d9c48e65bac9c95347361ed06367a
Auto-generated-cl: translation import
hotoviewer/res/values-af/strings.xml
hotoviewer/res/values-ar/strings.xml
hotoviewer/res/values-be/strings.xml
hotoviewer/res/values-cs/strings.xml
hotoviewer/res/values-da/strings.xml
hotoviewer/res/values-de/strings.xml
hotoviewer/res/values-el/strings.xml
hotoviewer/res/values-en-rGB/strings.xml
hotoviewer/res/values-fi/strings.xml
hotoviewer/res/values-fr/strings.xml
hotoviewer/res/values-hi/strings.xml
hotoviewer/res/values-hu/strings.xml
hotoviewer/res/values-in/strings.xml
hotoviewer/res/values-it/strings.xml
hotoviewer/res/values-iw/strings.xml
hotoviewer/res/values-ja/strings.xml
hotoviewer/res/values-ms/strings.xml
hotoviewer/res/values-nl/strings.xml
hotoviewer/res/values-pl/strings.xml
hotoviewer/res/values-pt-rPT/strings.xml
hotoviewer/res/values-ru/strings.xml
hotoviewer/res/values-sk/strings.xml
hotoviewer/res/values-sw/strings.xml
hotoviewer/res/values-th/strings.xml
hotoviewer/res/values-tl/strings.xml
hotoviewer/res/values-tr/strings.xml
hotoviewer/res/values-zh-rCN/strings.xml
hotoviewer/res/values-zh-rTW/strings.xml
|
| 129845a5815abf5d1374b27e01f6993ab453e9d1 |
28-Jun-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE
Change-Id: I98a1120cd481bf6dcb24b5387c69e2c8d4a45d53
Auto-generated-cl: translation import
hotoviewer/res/values-af/strings.xml
hotoviewer/res/values-ar/strings.xml
hotoviewer/res/values-be/strings.xml
hotoviewer/res/values-cs/strings.xml
hotoviewer/res/values-da/strings.xml
hotoviewer/res/values-de/strings.xml
hotoviewer/res/values-el/strings.xml
hotoviewer/res/values-en-rGB/strings.xml
hotoviewer/res/values-fi/strings.xml
hotoviewer/res/values-fr/strings.xml
hotoviewer/res/values-hi/strings.xml
hotoviewer/res/values-hu/strings.xml
hotoviewer/res/values-in/strings.xml
hotoviewer/res/values-it/strings.xml
hotoviewer/res/values-iw/strings.xml
hotoviewer/res/values-ja/strings.xml
hotoviewer/res/values-ms/strings.xml
hotoviewer/res/values-nl/strings.xml
hotoviewer/res/values-pl/strings.xml
hotoviewer/res/values-pt-rPT/strings.xml
hotoviewer/res/values-ru/strings.xml
hotoviewer/res/values-sk/strings.xml
hotoviewer/res/values-sw/strings.xml
hotoviewer/res/values-th/strings.xml
hotoviewer/res/values-tl/strings.xml
hotoviewer/res/values-tr/strings.xml
hotoviewer/res/values-zh-rCN/strings.xml
hotoviewer/res/values-zh-rTW/strings.xml
|
| 9aa4d6f3db5d758bef79e6ac4a90148f0c192e6b |
27-Jun-2012 |
Ying Wang <wangying@google.com> |
am 9dd37058: (-s ours) Import translations. DO NOT MERGE
* commit '9dd37058fa46c74d4cdc90f7562e4458dd8d37b3':
Import translations. DO NOT MERGE
|
| dd8ea5747efe32a18a2761f5f071eb96429d2d20 |
27-Jun-2012 |
Ying Wang <wangying@google.com> |
Import translations. DO NOT MERGE
Change-Id: I870c5e25044d61c61fe53bf227f53838e1ea6bc1
hotoviewer/res/values-sv/strings.xml
|
| 9dd37058fa46c74d4cdc90f7562e4458dd8d37b3 |
27-Jun-2012 |
Ying Wang <wangying@google.com> |
Import translations. DO NOT MERGE
Change-Id: Ib683da0aa64c2c63dfc672ea18b7417aded3ec5c
hotoviewer/res/values-sv/strings.xml
|
| 3fc60c81dabab76c0617494dbbf016a2f2894c18 |
26-Jun-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
| 2bad19c066f9000d3d169827612c922e9ffeac72 |
25-Jun-2012 |
Tom Taylor <tomtaylor@google.com> |
am d38f00f9: am ea9eeb87: Area code truncated for the phone number in messaging app
* commit 'd38f00f9a8e4e5363d65bae962859f37f8102fa5':
Area code truncated for the phone number in messaging app
|
| d38f00f9a8e4e5363d65bae962859f37f8102fa5 |
25-Jun-2012 |
Tom Taylor <tomtaylor@google.com> |
am ea9eeb87: Area code truncated for the phone number in messaging app
* commit 'ea9eeb8781cf1494cb17b2839a1d43e19e813e14':
Area code truncated for the phone number in messaging app
|
| ea9eeb8781cf1494cb17b2839a1d43e19e813e14 |
25-Jun-2012 |
Tom Taylor <tomtaylor@google.com> |
Area code truncated for the phone number in messaging app
Bug 6717762
When launching mms from the contacts app, numbers sometimes get munged,
either by losing the area code (if in parens) or losing the number
completely and just ending up with a contact name.
Parse all the parts of a contact "fred flinstone <512-123-1231>" looking
for the phone number. Also handle the case where the area code is lost when
in parens (i.e. (800) 891-8923).
Change-Id: I76976fa8004c1d7c03a651b3915537245fee16e4
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 757a2f247ba411e590d784653c3137acfb7f04c1 |
25-Jun-2012 |
Andrew Sapperstein <asapperstein@google.com> |
am 1cc4b214: Initial import of the photo viewer.
* commit '1cc4b2144a45abb495c8b14f6cfc5a10fb5e8ba8':
Initial import of the photo viewer.
|
| 1cc4b2144a45abb495c8b14f6cfc5a10fb5e8ba8 |
23-Jun-2012 |
Andrew Sapperstein <asapperstein@google.com> |
Initial import of the photo viewer.
Change-Id: Ia6b1cb2ae3b40ef004823a0d84fe3c2f52ed66e9
hotoviewer/Android.mk
hotoviewer/AndroidManifest.xml
hotoviewer/res/drawable/photo_view_background.xml
hotoviewer/res/layout/photo_activity_view.xml
hotoviewer/res/layout/photo_fragment_view.xml
hotoviewer/res/values/colors.xml
hotoviewer/res/values/dimen.xml
hotoviewer/res/values/strings.xml
hotoviewer/res/values/themes.xml
hotoviewer/src/com/android/ex/photo/Intents.java
hotoviewer/src/com/android/ex/photo/PhotoViewActivity.java
hotoviewer/src/com/android/ex/photo/PhotoViewPager.java
hotoviewer/src/com/android/ex/photo/adapters/BaseCursorPagerAdapter.java
hotoviewer/src/com/android/ex/photo/adapters/BaseFragmentPagerAdapter.java
hotoviewer/src/com/android/ex/photo/adapters/PhotoPagerAdapter.java
hotoviewer/src/com/android/ex/photo/fragments/PhotoViewFragment.java
hotoviewer/src/com/android/ex/photo/loaders/PhotoBitmapLoader.java
hotoviewer/src/com/android/ex/photo/loaders/PhotoPagerLoader.java
hotoviewer/src/com/android/ex/photo/provider/PhotoContract.java
hotoviewer/src/com/android/ex/photo/util/ImageUtils.java
hotoviewer/src/com/android/ex/photo/views/PhotoView.java
|
| e62987b55e69ab79380d5e73001a44a6f5769397 |
25-Jun-2012 |
Mindy Pereira <mindyp@google.com> |
am 2e85fe67: am ba14c7b0: Don\'t scroll when we are clearing text.
* commit '2e85fe675f98f731b86141f6c47469d3d7055d63':
Don't scroll when we are clearing text.
|
| 2e85fe675f98f731b86141f6c47469d3d7055d63 |
25-Jun-2012 |
Mindy Pereira <mindyp@google.com> |
am ba14c7b0: Don\'t scroll when we are clearing text.
* commit 'ba14c7b002c0ef9357bcaea64b5c5255183b1b52':
Don't scroll when we are clearing text.
|
| ba14c7b002c0ef9357bcaea64b5c5255183b1b52 |
25-Jun-2012 |
Mindy Pereira <mindyp@google.com> |
Don't scroll when we are clearing text.
Only scroll when the user adds text.
Fixes b/6696682 Compose email field is out of view after changing from Reply to Reply all for a message
Change-Id: I188f9be0b4993edab282256d647501b6734242f7
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 0d103b259b79323ca40e74af1de99c4d3593f5bf |
14-Jun-2012 |
Daisuke Miyakawa <dmiyakawa@google.com> |
Add missing AOSP license
Change-Id: I464da982a0c9e2ab301f90e0d17780b52d8e2097
hips/AndroidManifest.xml
|
| de764172b85e86436724a47d19f642dacf73b9fe |
07-Jun-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 4f14d40c: Reconcile with jb-release
* commit '4f14d40cef4b0cfedc94de65a46f4bb08587ead4':
|
| 4f14d40cef4b0cfedc94de65a46f4bb08587ead4 |
07-Jun-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-release
Change-Id: I0625bfe56c7aad5b243bbdaca39d9aa5206768e5
|
| 6926935208894e9e6d02bbe381d95c6e9850a6a4 |
05-Jun-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
| 9b18bf92bf867b5c258b616e0ec39549ce9d03d4 |
05-Jun-2012 |
Mindy Pereira <mindyp@google.com> |
am ffb60406: am 87a5af3e: Break out of infinite loop once we detect an error.
* commit 'ffb60406a521e38c6f5fb8567d332a60a4454803':
Break out of infinite loop once we detect an error.
|
| ffb60406a521e38c6f5fb8567d332a60a4454803 |
05-Jun-2012 |
Mindy Pereira <mindyp@google.com> |
am 87a5af3e: Break out of infinite loop once we detect an error.
* commit '87a5af3ed31a18c66aa62154e66e3d841dc02a27':
Break out of infinite loop once we detect an error.
|
| 87a5af3ed31a18c66aa62154e66e3d841dc02a27 |
05-Jun-2012 |
Mindy Pereira <mindyp@google.com> |
Break out of infinite loop once we detect an error.
Fixes b/6606808 Crash in Gmail {OutOfMemoryError- at android.graphics.Bitmap.nativeCreate(Native Method) }
Change-Id: Ic62c15bd59060f552aef5be0cc06e26b56efd462
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| cb7b9562efda73b162022df58e9ca1d37f3bc25e |
29-May-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am e9792f85: Reconcile with jb-release
* commit 'e9792f851553841b9308a0527535105a0c6c2286':
|
| e9792f851553841b9308a0527535105a0c6c2286 |
29-May-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-release
Change-Id: I4ed461be1da6f281ce62f82e30af2f7063fef828
|
| 3a9c45cc68bf6d365b1b462433d191baa96666c5 |
29-May-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
| 4cdee7a61b140cf1a38b3d1eb1ac596525aa609b |
25-May-2012 |
Eric Fischer <enf@google.com> |
am 90817b80: (-s ours) am 8c2158e5: Import translations. DO NOT MERGE
* commit '90817b8067ee76c0714b97ef93a0fab8d18b2116':
Import translations. DO NOT MERGE
|
| 90817b8067ee76c0714b97ef93a0fab8d18b2116 |
25-May-2012 |
Eric Fischer <enf@google.com> |
am 8c2158e5: Import translations. DO NOT MERGE
* commit '8c2158e5d5e87080f545e8bc1070f925c15f5466':
Import translations. DO NOT MERGE
|
| 85e9cc3b7072025bbb305015120348d3b325210c |
25-May-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE
Change-Id: I56d4335e4d976d152b6be18d9344f1a7013cef59
hips/res/values-af/strings.xml
hips/res/values-am/strings.xml
hips/res/values-ar/strings.xml
hips/res/values-be/strings.xml
hips/res/values-bg/strings.xml
hips/res/values-ca/strings.xml
hips/res/values-cs/strings.xml
hips/res/values-da/strings.xml
hips/res/values-de/strings.xml
hips/res/values-el/strings.xml
hips/res/values-en-rGB/strings.xml
hips/res/values-es-rUS/strings.xml
hips/res/values-es/strings.xml
hips/res/values-et/strings.xml
hips/res/values-fa/strings.xml
hips/res/values-fi/strings.xml
hips/res/values-fr/strings.xml
hips/res/values-hi/strings.xml
hips/res/values-hr/strings.xml
hips/res/values-hu/strings.xml
hips/res/values-in/strings.xml
hips/res/values-it/strings.xml
hips/res/values-iw/strings.xml
hips/res/values-ja/strings.xml
hips/res/values-ko/strings.xml
hips/res/values-lt/strings.xml
hips/res/values-lv/strings.xml
hips/res/values-ms/strings.xml
hips/res/values-nb/strings.xml
hips/res/values-nl/strings.xml
hips/res/values-pl/strings.xml
hips/res/values-pt-rPT/strings.xml
hips/res/values-pt/strings.xml
hips/res/values-ro/strings.xml
hips/res/values-ru/strings.xml
hips/res/values-sk/strings.xml
hips/res/values-sl/strings.xml
hips/res/values-sr/strings.xml
hips/res/values-sv/strings.xml
hips/res/values-sw/strings.xml
hips/res/values-th/strings.xml
hips/res/values-tl/strings.xml
hips/res/values-tr/strings.xml
hips/res/values-uk/strings.xml
hips/res/values-vi/strings.xml
hips/res/values-zh-rCN/strings.xml
hips/res/values-zh-rTW/strings.xml
hips/res/values-zu/strings.xml
|
| 8c2158e5d5e87080f545e8bc1070f925c15f5466 |
25-May-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE
Change-Id: Icd20a3bf7381096db956b3ae11ed9694429ed5a7
hips/res/values-af/strings.xml
hips/res/values-am/strings.xml
hips/res/values-ar/strings.xml
hips/res/values-be/strings.xml
hips/res/values-bg/strings.xml
hips/res/values-ca/strings.xml
hips/res/values-cs/strings.xml
hips/res/values-da/strings.xml
hips/res/values-de/strings.xml
hips/res/values-el/strings.xml
hips/res/values-en-rGB/strings.xml
hips/res/values-es-rUS/strings.xml
hips/res/values-es/strings.xml
hips/res/values-et/strings.xml
hips/res/values-fa/strings.xml
hips/res/values-fi/strings.xml
hips/res/values-fr/strings.xml
hips/res/values-hi/strings.xml
hips/res/values-hr/strings.xml
hips/res/values-hu/strings.xml
hips/res/values-in/strings.xml
hips/res/values-it/strings.xml
hips/res/values-iw/strings.xml
hips/res/values-ja/strings.xml
hips/res/values-ko/strings.xml
hips/res/values-lt/strings.xml
hips/res/values-lv/strings.xml
hips/res/values-ms/strings.xml
hips/res/values-nb/strings.xml
hips/res/values-nl/strings.xml
hips/res/values-pl/strings.xml
hips/res/values-pt-rPT/strings.xml
hips/res/values-pt/strings.xml
hips/res/values-ro/strings.xml
hips/res/values-ru/strings.xml
hips/res/values-sk/strings.xml
hips/res/values-sl/strings.xml
hips/res/values-sr/strings.xml
hips/res/values-sv/strings.xml
hips/res/values-sw/strings.xml
hips/res/values-th/strings.xml
hips/res/values-tl/strings.xml
hips/res/values-tr/strings.xml
hips/res/values-uk/strings.xml
hips/res/values-vi/strings.xml
hips/res/values-zh-rCN/strings.xml
hips/res/values-zh-rTW/strings.xml
hips/res/values-zu/strings.xml
|
| 2d0d704ac8c58438e3849de75c12edb371980668 |
25-May-2012 |
Mindy Pereira <mindyp@google.com> |
am 567f6456: am d5c5e621: Merge "Rather than change the text, just remove the waiting for entries row." into jb-dev
* commit '567f6456143d519bc5f0c7818a81c63f3dcd9413':
Rather than change the text, just remove the waiting for entries row.
|
| 567f6456143d519bc5f0c7818a81c63f3dcd9413 |
25-May-2012 |
Mindy Pereira <mindyp@google.com> |
am d5c5e621: Merge "Rather than change the text, just remove the waiting for entries row." into jb-dev
* commit 'd5c5e621362f5f6c6592ef69c0cb8a79441e3e6b':
Rather than change the text, just remove the waiting for entries row.
|
| d5c5e621362f5f6c6592ef69c0cb8a79441e3e6b |
25-May-2012 |
Mindy Pereira <mindyp@google.com> |
Merge "Rather than change the text, just remove the waiting for entries row." into jb-dev
|
| 1e9e640680692868c1323422f248261c4ff4d259 |
25-May-2012 |
Mindy Pereira <mindyp@google.com> |
Rather than change the text, just remove the waiting for entries row.
Fixes b/6546713 Blank suggestion is sometimes shown even if nothing was typed
per ux
Change-Id: I5c6d1f6620426bd96abca1bad650663ab6c5c426
hips/res/layout/chips_waiting_for_directory_search.xml
hips/res/values/strings.xml
hips/src/com/android/ex/chips/BaseRecipientAdapter.java
hips/src/com/android/ex/chips/RecipientEntry.java
|
| 7fb1843d7dd54eb78b5d37bd4d5ecf4e8ee5c311 |
25-May-2012 |
Mindy Pereira <mindyp@google.com> |
am 1c30f159: am 9c8e43d2: Merge "The mysterious blank item was just a mis-used layout" into jb-dev
* commit '1c30f159d7a5eb64c35b8a817e8153437cae32f2':
The mysterious blank item was just a mis-used layout
|
| 1c30f159d7a5eb64c35b8a817e8153437cae32f2 |
25-May-2012 |
Mindy Pereira <mindyp@google.com> |
am 9c8e43d2: Merge "The mysterious blank item was just a mis-used layout" into jb-dev
* commit '9c8e43d28551cb00a1bc1e501b8e2a4237838c5d':
The mysterious blank item was just a mis-used layout
|
| 9c8e43d28551cb00a1bc1e501b8e2a4237838c5d |
25-May-2012 |
Mindy Pereira <mindyp@google.com> |
Merge "The mysterious blank item was just a mis-used layout" into jb-dev
|
| 5c9051141d7dc1a21ea619c10afcd18e37b615a2 |
25-May-2012 |
Mindy Pereira <mindyp@google.com> |
The mysterious blank item was just a mis-used layout
Was expecting the chips_waiting_for_directory_search layout
But was given the chips_recipient layout
Fixed this to use the correct layout
fixes b/6546713 Blank suggestion is sometimes shown even if nothing was typed
that's at least part of the problem
why it shows up "uninvited" is another question
Change-Id: Ie60b9ae8f7f86dda4316fee43b3983fbe0f17cb0
hips/res/layout/chips_waiting_for_directory_search.xml
hips/src/com/android/ex/chips/BaseRecipientAdapter.java
|
| 74f9eae893f208979de29ac04e58e403386775f5 |
24-May-2012 |
Mindy Pereira <mindyp@google.com> |
am 2797dbd5: am 3a36cf75: Merge "Dont hide the keyboard when showing alternates/ selecting a chip." into jb-dev
* commit '2797dbd5ffe5affe7de61373dac70b6af755fab4':
Dont hide the keyboard when showing alternates/ selecting a chip.
|
| 2797dbd5ffe5affe7de61373dac70b6af755fab4 |
24-May-2012 |
Mindy Pereira <mindyp@google.com> |
am 3a36cf75: Merge "Dont hide the keyboard when showing alternates/ selecting a chip." into jb-dev
* commit '3a36cf75590c4c4c134bbdd0688b33250af5a607':
Dont hide the keyboard when showing alternates/ selecting a chip.
|
| 3a36cf75590c4c4c134bbdd0688b33250af5a607 |
24-May-2012 |
Mindy Pereira <mindyp@google.com> |
Merge "Dont hide the keyboard when showing alternates/ selecting a chip." into jb-dev
|
| c75bea26b81d1075fac128188a594aa511d94d9b |
24-May-2012 |
Mindy Pereira <mindyp@google.com> |
Dont hide the keyboard when showing alternates/ selecting a chip.
Fixes b/5557044 Chips replace-email-window shouldn't close the keyboard
Change-Id: I93829983346de77ee79dd602ae84152d262ce01d
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| df5c47c84e5cc97ded2cceca5a2be37fc75c1556 |
24-May-2012 |
Mindy Pereira <mindyp@google.com> |
am eba508d0: am 932ec21b: Merge "Null check; back behavior" into jb-dev
* commit 'eba508d0697c06c4a889c06ad7728a0cbce78e49':
Null check; back behavior
|
| eba508d0697c06c4a889c06ad7728a0cbce78e49 |
24-May-2012 |
Mindy Pereira <mindyp@google.com> |
am 932ec21b: Merge "Null check; back behavior" into jb-dev
* commit '932ec21b60a7829e0535b105172045daaed3278e':
Null check; back behavior
|
| 932ec21b60a7829e0535b105172045daaed3278e |
24-May-2012 |
Mindy Pereira <mindyp@google.com> |
Merge "Null check; back behavior" into jb-dev
|
| 441b417f05bf807429281e6ad7cd43c9bdba87a6 |
24-May-2012 |
Mindy Pereira <mindyp@google.com> |
Null check; back behavior
Since its possible there was no chip formed for an address, it is
possible there is no address in some part of the inAddresses array, so
build it up as an arraylist so we don't have null spots.
Fixes b/6555471 NPE in com.android.ex.chips.RecipientAlternatesAdapter.getMatchingRecipients
Fixes b/6556107 when contact chip is selected back button should dismiss the popup and unselct the chip
Change-Id: If74b13ccc5f51aafc3638817b5fbef54cd57548c
hips/src/com/android/ex/chips/RecipientAlternatesAdapter.java
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 1787664631b8fe722b7102e8dbf569b01c39aefd |
24-May-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 218ea026: Reconcile with jb-release
* commit '218ea026d5722ecf62b6969b4c8924236516ccd0':
|
| 218ea026d5722ecf62b6969b4c8924236516ccd0 |
24-May-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-release
Change-Id: Id6125c430848f989d6ce0494403114c137a1dfa3
|
| cebf374296c6258e1bb4df31b0b0629752b84324 |
24-May-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
| 8dba5403588d16fd4471f6315454143757d0c0af |
24-May-2012 |
Mindy Pereira <mindyp@google.com> |
am 02840dc1: am 9c5e0403: Fix offset of alternates list dropdown.
* commit '02840dc19cf49bb4fa1e7234bcdb0f573c3c37e1':
Fix offset of alternates list dropdown.
|
| 02840dc19cf49bb4fa1e7234bcdb0f573c3c37e1 |
24-May-2012 |
Mindy Pereira <mindyp@google.com> |
am 9c5e0403: Fix offset of alternates list dropdown.
* commit '9c5e04038d482571b9373a118c9dfc50e4e18505':
Fix offset of alternates list dropdown.
|
| 9c5e04038d482571b9373a118c9dfc50e4e18505 |
24-May-2012 |
Mindy Pereira <mindyp@google.com> |
Fix offset of alternates list dropdown.
Fixes b/6546711 Chips suggestion is below selected chip
Change-Id: I14821855b510b30e8eb4798eb4cc4a9c69f4dca9
hips/res/values/dimen.xml
hips/res/values/styles.xml
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 8ae862b749e701160a26187b350bc2138de179f1 |
23-May-2012 |
Mindy Pereira <mindyp@google.com> |
am 7178b0bc: am 291e619b: Try this out with experimenters to see if the scrolling is reasonable.
* commit '7178b0bcab6327bc9e853c8db316f95de22ea53c':
Try this out with experimenters to see if the scrolling is reasonable.
|
| 7178b0bcab6327bc9e853c8db316f95de22ea53c |
23-May-2012 |
Mindy Pereira <mindyp@google.com> |
am 291e619b: Try this out with experimenters to see if the scrolling is reasonable.
* commit '291e619b2b2ced9abe53fc97613f5707319325bb':
Try this out with experimenters to see if the scrolling is reasonable.
|
| 291e619b2b2ced9abe53fc97613f5707319325bb |
23-May-2012 |
Mindy Pereira <mindyp@google.com> |
Try this out with experimenters to see if the scrolling is reasonable.
It seems that what annoyed arubin was that focusing the item changed the scroll
position
So I am now just changing it when the user actually starts entering text
Change-Id: I8868cde2fc90b1e253c50fd3fad900f811442e6d
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| f135d5f376688acd78cd5bf0cf66a0c846f8305c |
21-May-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 21a012ef: Reconcile with jb-release nakasi-factoryrom-release
* commit '21a012ef1a1f06acda65fc6e3efaa72ffe1d2b07':
|
| 21a012ef1a1f06acda65fc6e3efaa72ffe1d2b07 |
19-May-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-release nakasi-factoryrom-release
Change-Id: I1e1e925225a01365127f5316827d8c4ca2e34fa4
|
| b143d86fa9cb96037963021d337bc87ad1426670 |
18-May-2012 |
The Android Automerger <android-build@android.com> |
merge in nakasi-factoryrom-release history after reset to jb-dev
|
| f351b6c0095a449f72342e88ecd88c18abb414c5 |
18-May-2012 |
Eric Fischer <enf@google.com> |
am 54e55fee: (-s ours) am 9ec75cef: Import translations. DO NOT MERGE
* commit '54e55fee195e146935b86ae4fc9c253a8f7001f4':
Import translations. DO NOT MERGE
|
| bb085f3376933f8dac8f0047c779fa43f04434b8 |
17-May-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
| 54e55fee195e146935b86ae4fc9c253a8f7001f4 |
16-May-2012 |
Eric Fischer <enf@google.com> |
am 9ec75cef: Import translations. DO NOT MERGE
* commit '9ec75ceffe2f2b08484b8772ab429f8998110228':
Import translations. DO NOT MERGE
|
| 1fe84a2d7b08cb1f2a95757183e0ea55de29b548 |
16-May-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE
Change-Id: Ia6d84f8f44addb48c7205f85a40c7f1a54d17485
hips/res/values-ar/strings.xml
hips/res/values-ca/strings.xml
hips/res/values-fa/strings.xml
hips/res/values-ko/strings.xml
hips/res/values-lt/strings.xml
hips/res/values-lv/strings.xml
hips/res/values-nb/strings.xml
hips/res/values-nl/strings.xml
hips/res/values-pl/strings.xml
hips/res/values-pt-rPT/strings.xml
hips/res/values-ro/strings.xml
hips/res/values-sk/strings.xml
hips/res/values-sl/strings.xml
hips/res/values-sr/strings.xml
hips/res/values-th/strings.xml
hips/res/values-tl/strings.xml
hips/res/values-tr/strings.xml
hips/res/values-vi/strings.xml
|
| 9ec75ceffe2f2b08484b8772ab429f8998110228 |
16-May-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE
Change-Id: I0e9753e42606ce003377d4dd6fa497472ba4e998
hips/res/values-ar/strings.xml
hips/res/values-ca/strings.xml
hips/res/values-fa/strings.xml
hips/res/values-ko/strings.xml
hips/res/values-lt/strings.xml
hips/res/values-lv/strings.xml
hips/res/values-nb/strings.xml
hips/res/values-nl/strings.xml
hips/res/values-pl/strings.xml
hips/res/values-pt-rPT/strings.xml
hips/res/values-ro/strings.xml
hips/res/values-sk/strings.xml
hips/res/values-sl/strings.xml
hips/res/values-sr/strings.xml
hips/res/values-th/strings.xml
hips/res/values-tl/strings.xml
hips/res/values-tr/strings.xml
hips/res/values-vi/strings.xml
|
| d444e484b019cce045e677697b1596fe145c22b9 |
16-May-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 9d3bd0a0: Reconcile with jb-release nakasi-factoryrom-release
* commit '9d3bd0a0a8d0f3bfa0b27d18fc3b537294236b16':
|
| 9d3bd0a0a8d0f3bfa0b27d18fc3b537294236b16 |
16-May-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-release nakasi-factoryrom-release
Change-Id: I485a446c65379f9e8a255cd76a775470a90d24ab
|
| f0037159bcfdee3a2069bdb2e83821efe69d0e4b |
16-May-2012 |
The Android Automerger <android-build@android.com> |
merge in nakasi-factoryrom-release history after reset to jb-dev
|
| 42362b2ce5f5b34071cc289ec4b51cb35f08bf99 |
16-May-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
| 146ea8427a124bc27cd77057f4a1cccfda184b87 |
16-May-2012 |
Eric Fischer <enf@google.com> |
am b775f325: (-s ours) Import translations. DO NOT MERGE
* commit 'b775f325f8a6d4ebb30b88fec897c2abf1fc4bb8':
Import translations. DO NOT MERGE
|
| 257de1d9d7b7787a62f61bd09e4c8aa59975086c |
16-May-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE
Change-Id: I610162a09daaab72c1a7b19eb4705ef5928c3733
hips/res/values-da/strings.xml
hips/res/values-es/strings.xml
hips/res/values-ja/strings.xml
hips/res/values-sw/strings.xml
hips/res/values-zh-rCN/strings.xml
|
| b775f325f8a6d4ebb30b88fec897c2abf1fc4bb8 |
16-May-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE
Change-Id: I6e1d7a7e44633676a6e3bcf8a341a6b370a5632f
hips/res/values-da/strings.xml
hips/res/values-es/strings.xml
hips/res/values-ja/strings.xml
hips/res/values-sw/strings.xml
hips/res/values-zh-rCN/strings.xml
|
| f7c340937c69eb6d381fa31dcf0d63e908320e21 |
15-May-2012 |
The Android Automerger <android-build@android.com> |
merge in nakasi-factoryrom-release history after reset to jb-dev
|
| 20da5774b3873478af2b5eefd96cba210354be2e |
15-May-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
| 22d63c449fd041a87d0fed7215b0e6ece04e5caa |
15-May-2012 |
Eric Fischer <enf@google.com> |
am 8b62d386: (-s ours) Import translations. DO NOT MERGE
* commit '8b62d386af786e63d7b4572fc336456e097392aa':
Import translations. DO NOT MERGE
|
| 20a3b8c7f41350de18128452af9b95d01b5295d9 |
14-May-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE
Change-Id: Iceee51b73ac6747cf518ce6e6b6e6f4ca151961c
hips/res/values-af/strings.xml
hips/res/values-am/strings.xml
hips/res/values-be/strings.xml
hips/res/values-bg/strings.xml
hips/res/values-cs/strings.xml
hips/res/values-de/strings.xml
hips/res/values-el/strings.xml
hips/res/values-es-rUS/strings.xml
hips/res/values-et/strings.xml
hips/res/values-fi/strings.xml
hips/res/values-fr/strings.xml
hips/res/values-hi/strings.xml
hips/res/values-hr/strings.xml
hips/res/values-in/strings.xml
hips/res/values-it/strings.xml
hips/res/values-iw/strings.xml
hips/res/values-ms/strings.xml
hips/res/values-pt/strings.xml
hips/res/values-ru/strings.xml
hips/res/values-sv/strings.xml
hips/res/values-uk/strings.xml
hips/res/values-zh-rTW/strings.xml
hips/res/values-zu/strings.xml
|
| 8b62d386af786e63d7b4572fc336456e097392aa |
14-May-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE
Change-Id: I0a6df579218b6af26e5ede6141df14dd0f6065da
hips/res/values-af/strings.xml
hips/res/values-am/strings.xml
hips/res/values-be/strings.xml
hips/res/values-bg/strings.xml
hips/res/values-cs/strings.xml
hips/res/values-de/strings.xml
hips/res/values-el/strings.xml
hips/res/values-es-rUS/strings.xml
hips/res/values-et/strings.xml
hips/res/values-fi/strings.xml
hips/res/values-fr/strings.xml
hips/res/values-hi/strings.xml
hips/res/values-hr/strings.xml
hips/res/values-in/strings.xml
hips/res/values-it/strings.xml
hips/res/values-iw/strings.xml
hips/res/values-ms/strings.xml
hips/res/values-pt/strings.xml
hips/res/values-ru/strings.xml
hips/res/values-sv/strings.xml
hips/res/values-uk/strings.xml
hips/res/values-zh-rTW/strings.xml
hips/res/values-zu/strings.xml
|
| ce538a423a9c03555427923f98162b8436245acf |
14-May-2012 |
Eric Fischer <enf@google.com> |
am ff7300c8: (-s ours) Import translations. DO NOT MERGE
* commit 'ff7300c8b6c14380ade2de7c943422791abb54cd':
Import translations. DO NOT MERGE
|
| dd43737c41894c87f77e628b14bae6a86938fd29 |
14-May-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
| f9c54fb1992f9aa0b010624ea581bc18df123fdb |
11-May-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE
Change-Id: I971d77f57895e5d474f51683eaa02e8e734ac08c
hips/res/values-en-rGB/strings.xml
hips/res/values-es/strings.xml
hips/res/values-hu/strings.xml
|
| ff7300c8b6c14380ade2de7c943422791abb54cd |
11-May-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE
Change-Id: I600a0b4d0cc328bd4a34d7bfaae6d7726611ccc6
hips/res/values-en-rGB/strings.xml
hips/res/values-es/strings.xml
hips/res/values-hu/strings.xml
|
| 9922002f58da90295f04c24137cdb2e1dbfbb7a4 |
11-May-2012 |
Eric Fischer <enf@google.com> |
Merge "Import translations. DO NOT MERGE"
|
| 83f4d7363c7e56844387675fe106f34ff836f8cc |
11-May-2012 |
Eric Fischer <enf@google.com> |
am 564269bf: (-s ours) Import translations. DO NOT MERGE
* commit '564269bf84f29dd717b9549e7f350f912648bb90':
Import translations. DO NOT MERGE
|
| 271fa35caeb3e0ab3d14a58a88c075ad11d1c872 |
10-May-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE
Change-Id: I8bd647e1731d8d6299d67fa696cac504b963f2f5
hips/res/values-af/strings.xml
hips/res/values-am/strings.xml
hips/res/values-ar/strings.xml
hips/res/values-be/strings.xml
hips/res/values-bg/strings.xml
hips/res/values-ca/strings.xml
hips/res/values-cs/strings.xml
hips/res/values-da/strings.xml
hips/res/values-de/strings.xml
hips/res/values-el/strings.xml
hips/res/values-en-rGB/strings.xml
hips/res/values-es-rUS/strings.xml
hips/res/values-es/strings.xml
hips/res/values-et/strings.xml
hips/res/values-fa/strings.xml
hips/res/values-fi/strings.xml
hips/res/values-fr/strings.xml
hips/res/values-hi/strings.xml
hips/res/values-hr/strings.xml
hips/res/values-hu/strings.xml
hips/res/values-in/strings.xml
hips/res/values-it/strings.xml
hips/res/values-iw/strings.xml
hips/res/values-ja/strings.xml
hips/res/values-ko/strings.xml
hips/res/values-lt/strings.xml
hips/res/values-lv/strings.xml
hips/res/values-ms/strings.xml
hips/res/values-nb/strings.xml
hips/res/values-nl/strings.xml
hips/res/values-pl/strings.xml
hips/res/values-pt-rPT/strings.xml
hips/res/values-pt/strings.xml
hips/res/values-ro/strings.xml
hips/res/values-ru/strings.xml
hips/res/values-sk/strings.xml
hips/res/values-sl/strings.xml
hips/res/values-sr/strings.xml
hips/res/values-sv/strings.xml
hips/res/values-sw/strings.xml
hips/res/values-th/strings.xml
hips/res/values-tl/strings.xml
hips/res/values-tr/strings.xml
hips/res/values-uk/strings.xml
hips/res/values-vi/strings.xml
hips/res/values-zh-rCN/strings.xml
hips/res/values-zh-rTW/strings.xml
hips/res/values-zu/strings.xml
|
| 564269bf84f29dd717b9549e7f350f912648bb90 |
10-May-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE
Change-Id: I90b4b8a146fa4948784cc11e41d6ff4e9a06d843
hips/res/values-af/strings.xml
hips/res/values-am/strings.xml
hips/res/values-ar/strings.xml
hips/res/values-be/strings.xml
hips/res/values-bg/strings.xml
hips/res/values-ca/strings.xml
hips/res/values-cs/strings.xml
hips/res/values-da/strings.xml
hips/res/values-de/strings.xml
hips/res/values-el/strings.xml
hips/res/values-en-rGB/strings.xml
hips/res/values-es-rUS/strings.xml
hips/res/values-es/strings.xml
hips/res/values-et/strings.xml
hips/res/values-fa/strings.xml
hips/res/values-fi/strings.xml
hips/res/values-fr/strings.xml
hips/res/values-hi/strings.xml
hips/res/values-hr/strings.xml
hips/res/values-hu/strings.xml
hips/res/values-in/strings.xml
hips/res/values-it/strings.xml
hips/res/values-iw/strings.xml
hips/res/values-ja/strings.xml
hips/res/values-ko/strings.xml
hips/res/values-lt/strings.xml
hips/res/values-lv/strings.xml
hips/res/values-ms/strings.xml
hips/res/values-nb/strings.xml
hips/res/values-nl/strings.xml
hips/res/values-pl/strings.xml
hips/res/values-pt-rPT/strings.xml
hips/res/values-pt/strings.xml
hips/res/values-ro/strings.xml
hips/res/values-ru/strings.xml
hips/res/values-sk/strings.xml
hips/res/values-sl/strings.xml
hips/res/values-sr/strings.xml
hips/res/values-sv/strings.xml
hips/res/values-sw/strings.xml
hips/res/values-th/strings.xml
hips/res/values-tl/strings.xml
hips/res/values-tr/strings.xml
hips/res/values-uk/strings.xml
hips/res/values-vi/strings.xml
hips/res/values-zh-rCN/strings.xml
hips/res/values-zh-rTW/strings.xml
hips/res/values-zu/strings.xml
|
| 6fd91326843d103060c4a12af98846d390c2a615 |
10-May-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
| 2e0ba2ecb4ca8f21a6f42b860184c9c186f36021 |
09-May-2012 |
Alice Yang <alice@google.com> |
Merge "Move StaggeredGridView into ex from v4 support library"
|
| f30ffd135bc6c2d6b4488267f623eae271f25807 |
09-May-2012 |
Mindy Pereira <mindyp@google.com> |
am 1896ac00: Change text on "done" to say "return"
* commit '1896ac000251e74f4939421d3d4d28b69717c52a':
Change text on "done" to say "return"
|
| 1896ac000251e74f4939421d3d4d28b69717c52a |
09-May-2012 |
Mindy Pereira <mindyp@google.com> |
Change text on "done" to say "return"
Fixes b/6468243 While adding chips to the To field display label "Return" instead of "Done"
Change-Id: I42f9a845c553f0aa01971c5b3221ce5d0504c810
hips/res/values/strings.xml
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 8347d6ca5f1b3f4f1594d3bc16a0be2de4cc214a |
09-May-2012 |
Alice Yang <alice@google.com> |
Move StaggeredGridView into ex from v4 support library
Move this class because it's still experimental and
undergoing development. Below is the git history
log of the original file.
*************************************************************
commit b469af6dc2f8cda4020a78fb4582c1483089fd6e
Author: Adam Powell <adamp@google.com>
Date: Thu Apr 12 10:58:19 2012 -0700
Post invalidations on the animation tick if available for
StaggeredGridView/ViewPager.
Fix interaction with nested scrolling in ViewPager.
Finish settling a ViewPager that is close enough to the end of a fling
when touched.
Change-Id: Ia68be871c92cdb448d4030fdc4b806c78ea69c1a
commit 77e2f963d4bcac5e0a4704cd4ea684b04735053e
Author: Katherine Kuan <katherinekuan@google.com>
Date: Mon Apr 2 14:46:54 2012 -0700
Reset item tops and bottoms for StaggeredGridView
When the StaggeredGridView is going to display
a completely new set of data, offer a reset method
so item top and bottom information is cleared.
Fix NPE when adapter notifyDataSetChanged() is
called.
Bug: 6282841
Change-Id: If1aee80358e32420d2b3a0d4e48ede39002d650a
commit 25df93b813befb678835eb040c8158bb5aa8fe8d
Author: Adam Powell <adamp@google.com>
Date: Mon Mar 19 20:46:57 2012 -0700
Fix a bug with changing the column count in StaggeredGridView.
Change-Id: I7aa6544e03e4c7426c96a906f7c78b91d2e8ebb6
commit 121dba12686f0ff01cfe348c43a4f6f0edc18477
Author: Adam Powell <adamp@google.com>
Date: Mon Mar 19 20:22:22 2012 -0700
Properly handle top padding in StaggeredGridView while freshly populating items.
Change-Id: I6aa920320217017bc8720a4170739aee06b17537
commit 346e2f2390f0d743fd10e7d01a015df6b32292cd
Author: Adam Powell <adamp@google.com>
Date: Tue Feb 28 10:13:02 2012 -0800
StaggeredGridView and supporting functionality
Stable IDs are not yet supported.
Move/rename HCSparseArray => SparseArrayCompat; make it public.
Add some new features to ViewCompat.
Add ScrollerCompat; leave it package-private for now as it needs
a reasonable fallback implementation for new methods.
Change-Id: I87d6952ef2c7748a40558759372a2525d6a52cf0
Change-Id: I794a7b9666b0414d75a99ff2a5f939193b78026a
idget/java/com/android/ex/widget/StaggeredGridView.java
|
| 13715fa7c235b4d052b94cc8e9b82c52d754c7f9 |
08-May-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
| 7e12aaa7748c44952d91b88c6f2863c16fe06deb |
07-May-2012 |
Mindy Pereira <mindyp@google.com> |
am dd5c5cf8: Use ALIGN_BOTTOM instead of ALIGN_BASELINE
* commit 'dd5c5cf8541ca41b70f396c4ee3152c069b2b72d':
Use ALIGN_BOTTOM instead of ALIGN_BASELINE
|
| dd5c5cf8541ca41b70f396c4ee3152c069b2b72d |
07-May-2012 |
Mindy Pereira <mindyp@google.com> |
Use ALIGN_BOTTOM instead of ALIGN_BASELINE
This certainly looks better
Fixes b/6369828 When there are 2 chips/labels stacked top one is compressed
Change-Id: I345bd5feec16a5d9352d4ad20dfb9725d76bb208
hips/src/com/android/ex/chips/RecipientChip.java
|
| 0ce0cf7bb4f6ac412f0e440a2b26580099976f5a |
05-May-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
| 32bfa893e9de281de41b865c207c002ebac72207 |
04-May-2012 |
Tom Taylor <tomtaylor@google.com> |
am ab2c5069: Contact added to the "To" field of the Messaging app is not getting deleted
* commit 'ab2c50697fd2ff580c308984b8f313536ff83b30':
Contact added to the "To" field of the Messaging app is not getting deleted
|
| ab2c50697fd2ff580c308984b8f313536ff83b30 |
04-May-2012 |
Tom Taylor <tomtaylor@google.com> |
Contact added to the "To" field of the Messaging app is not getting deleted
Bug 6435466
If you have a chip representing a phone number with the area code in parens
with a space (i.e.: "(425) 234-4322"), the chip would get committed when
the user was deleting chars and hit the space char. Ignore the special
email handling code for this case when in phone number mode.
Change-Id: I998e273a88b9f30b651dedb41a39b7d37794be97
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| b7719c178971456193958253d8164bb352981d10 |
04-May-2012 |
Tom Taylor <tomtaylor@google.com> |
am 5ba77015: Merge "Don\'t autoselect first item in dropdown" into jb-dev
* commit '5ba770158da0c75c31f6d736f39b38d6fb4bb4d9':
Don't autoselect first item in dropdown
|
| 5ba770158da0c75c31f6d736f39b38d6fb4bb4d9 |
04-May-2012 |
Tom Taylor <tomtaylor@google.com> |
Merge "Don't autoselect first item in dropdown" into jb-dev
|
| 577223c7c81bd5fe0c00a1b8eeeecd50f61369a8 |
04-May-2012 |
Tom Taylor <tomtaylor@google.com> |
Don't autoselect first item in dropdown
Bug 6434183
When in phone mode and the user types something that happens to bring up
the dropdown, don't auto-select the first item if they don't choose
something. This was preventing users from entering numbers and shortcuts
that happened to be close matches to existing contacts. Unless the user
selects an item, keep what they manually entered. The change looks much
bigger than is really is. The only real change is in commitChip. The rest
of the changes are to call a helper function, rather than duplicating the
same code throughout the file.
Change-Id: Ia0ec24a3667770fa5d43ff870ed87019b732627e
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 525ec74378bd0de0f14bd20b52f6d9b9c537a9c0 |
03-May-2012 |
Mindy Pereira <mindyp@google.com> |
am 593f0b4e: Fix alternate reverse lookup query.
* commit '593f0b4e64753b8e8ad17fdf6dc7625819c829b8':
Fix alternate reverse lookup query.
|
| 593f0b4e64753b8e8ad17fdf6dc7625819c829b8 |
03-May-2012 |
Mindy Pereira <mindyp@google.com> |
Fix alternate reverse lookup query.
Fixes b/6428194 Chips misbehave when re-editing a draft
Change-Id: I6589ece36aac7dcfb4ac2650d555f8ce914f337e
hips/src/com/android/ex/chips/RecipientAlternatesAdapter.java
|
| 8f1f5423ffd82c378b373f5c6831513c6ed9df55 |
03-May-2012 |
Makoto Onuki <omakoto@google.com> |
am f64cbf19: Don\'t show duplicate destinations in alternate popup
* commit 'f64cbf19fb2bc09835a46472c8efd8c6c07fa5ab':
Don't show duplicate destinations in alternate popup
|
| f64cbf19fb2bc09835a46472c8efd8c6c07fa5ab |
03-May-2012 |
Makoto Onuki <omakoto@google.com> |
Don't show duplicate destinations in alternate popup
There isn't much thing we can do from the contacts provider side, so let's just
remove duplicates manually...
Bug 6428328
Change-Id: I78e7fc7ed66d7cf977935611c8fb0318ffa7c83b
hips/src/com/android/ex/chips/Queries.java
hips/src/com/android/ex/chips/RecipientAlternatesAdapter.java
hips/tests/src/com/android/ex/chips/RecipientAlternatesAdapterTest.java
|
| 4522a7855b5eaa2a74cd84ee378de748e8494275 |
03-May-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
| 79361f84cd616ee46b5522fd34ce27f948b5e701 |
02-May-2012 |
Eric Fischer <enf@google.com> |
am a97c5fbb: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-dev
* commit 'a97c5fbbbd1d12a1243a779e9cf71e0719f088d6':
Import translations. DO NOT MERGE
|
| 680a9d72e3a05733dd83baf22b6a0af7256971c6 |
02-May-2012 |
Eric Fischer <enf@google.com> |
Merge "Import translations. DO NOT MERGE"
|
| a97c5fbbbd1d12a1243a779e9cf71e0719f088d6 |
02-May-2012 |
Eric Fischer <enf@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-dev
|
| cff401395893158d08e89acfc678add481c8f1bd |
02-May-2012 |
Makoto Onuki <omakoto@google.com> |
Merge "Don't use DISPLAY_NAME for chips if name is email or phone" into jb-dev
|
| 23d7cfa079bcf20b28876c82a2f7f1be03e574b1 |
02-May-2012 |
Mindy Pereira <mindyp@google.com> |
Merge "Fix null ptr in test cases by supplying a test adapter." into jb-dev
|
| 391de8f776bcd194a4c155987960c5150a0059fc |
02-May-2012 |
Mindy Pereira <mindyp@google.com> |
Fix null ptr in test cases by supplying a test adapter.
Change-Id: If979703d1140f8ad74b2896825a6b490af746442
hips/tests/src/com/android/ex/chips/ChipsTest.java
|
| 1e95475c2051612f6313346c28baa2c920d872f4 |
02-May-2012 |
Mindy Pereira <mindyp@google.com> |
Merge "Test case fixes." into jb-dev
|
| 8e78ebb07fde680e8067c8bce84ad0935cfafb39 |
02-May-2012 |
Mindy Pereira <mindyp@google.com> |
Test case fixes.
Fix build to properly get chips resources.
Change-Id: Ibdeab82e64b323b753a842b1528205336a41b425
hips/tests/Android.mk
|
| 253372df3eb7e144b3b0662d2e92e058795f4b5f |
02-May-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE
Change-Id: I8003cc45640b8aa451e20b6f493d09d5d385a9de
hips/res/values-in/strings.xml
|
| d56c6a9059ba4f9b5ec4c3dff49c44e2dc2d00e1 |
02-May-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE
Change-Id: Ib185ee878ba7312c27d8d073106bead0dcba83a0
hips/res/values-in/strings.xml
|
| c0fe38a3774aac16645530ce854d3f22fa3b79f1 |
02-May-2012 |
Mindy Pereira <mindyp@google.com> |
Merge "Recycle styleable attributes after use." into jb-dev
|
| f1c61197ef28085c8c848cfebd8824231004d581 |
02-May-2012 |
Mindy Pereira <mindyp@google.com> |
Recycle styleable attributes after use.
Change-Id: I43319c0a36d45e8afa90ae1871ff17cbc6ecf961
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 8f968fc75a99645b5b170c3ca0bd3aca9a207ca7 |
02-May-2012 |
Makoto Onuki <omakoto@google.com> |
Don't use DISPLAY_NAME for chips if name is email or phone
Don't use contact's display name, if the name source is EMAIL
or PHONE (or UNDEFINED). Just use the destination (i.e. the actual email
address or phone number) as the name.
Bug 5414496
Bug 6425953
Change-Id: Id0e7e57122a4840b075710309306b074143199bf
hips/src/com/android/ex/chips/BaseRecipientAdapter.java
hips/src/com/android/ex/chips/Queries.java
hips/src/com/android/ex/chips/RecipientAlternatesAdapter.java
hips/src/com/android/ex/chips/RecipientEntry.java
|
| 92ea3b77e905a1180d249454fe4939d2634f8483 |
01-May-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
| e41d39ea07455834b402f35a84a2fbb8bf5888c7 |
30-Apr-2012 |
Mindy Pereira <mindyp@google.com> |
Merge "Vertically center text in chips." into jb-dev
|
| c791a39d4041f0e7513c93660d6cc94fdf43e6dd |
27-Apr-2012 |
Mindy Pereira <mindyp@google.com> |
Vertically center text in chips.
Was kind of off.
Fixes b/6370062 Text spacing in the error case chip should be centered
Change-Id: I4ac88f5bf2f7b61008728cec92abb3da9e5ee1be
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| c02e6898b22bb8839bde6face5c7797414ecdfa7 |
30-Apr-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
| 7ccedccdc10a58d94d2d4895c9637a5b77cf0427 |
27-Apr-2012 |
Mindy Pereira <mindyp@google.com> |
Merge "Use ime actions to commit when the user presses enter." into jb-dev
|
| 824aef7306c6a2e07e6157c25efe925f048597ed |
27-Apr-2012 |
Mindy Pereira <mindyp@google.com> |
Use ime actions to commit when the user presses enter.
TODO: is the enter key saying "done" ok?
Fixes b/6370021 Pressing return after entering address results in text not becoming chip, leaves text
Change-Id: I2d054335fdc0bd175d12a31dcab15f2ad956e9ec
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 9fe03f325deaf514a07bafe4a4d10fe1a8c5cd8a |
27-Apr-2012 |
Tom Taylor <tomtaylor@google.com> |
Merge "Fix an crash if you pass a SpannableString" into jb-dev
|
| 5e05ba80bdb12dfb5f40f202f57c55f5b68a311a |
27-Apr-2012 |
Tom Taylor <tomtaylor@google.com> |
Fix an crash if you pass a SpannableString
If a derived class passes a SpannableString to append, the code will
crash with an invalid cast. Simple fix.
Change-Id: I28f33b4eadabb8fce1ddba8cc1ece20b1d919764
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 6ea2a74088e3334b296dee2c83e7cbfa415f98db |
27-Apr-2012 |
Mindy Pereira <mindyp@google.com> |
Merge "Dont commit by commit char if we cant tokenize." into jb-dev
|
| f82e176c81d15a4b33ed4918b6dd76e1e84fd8ef |
27-Apr-2012 |
Mindy Pereira <mindyp@google.com> |
Dont commit by commit char if we cant tokenize.
Fixes b/6386831 Crash in Gmail on editing the To field after capturing a bugreport
fixes b/6394257 com.google.android.email: java.lang.NullPointerExceptionat com.android.ex.chips.RecipientEditTextView.commitDefault(RecipientEditTextView.java:1024)
Change-Id: I2c5fdde54d8b36cab05b88f6506d58a884ae0bf2
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 0d17760bb685bc0d4623cbc07da17415955acdab |
25-Apr-2012 |
Tom Taylor <tomtaylor@google.com> |
Fix alternates adapter
Make the same change for phone number chips as email chips:
tapping a chip was not showing the alternates for that contact.
Change-Id: I1fbac88a9869dbe97599e4d125709b4861f031d8
hips/src/com/android/ex/chips/RecipientAlternatesAdapter.java
|
| da0e86bcdc65ab3990cf77f752a6e02a73d5eaa9 |
25-Apr-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
| e71f6dbce4fb8b28c4733d9562c4cf651b23c3dd |
25-Apr-2012 |
Mindy Pereira <mindyp@google.com> |
Fix alternates adapter.
Tapping a chip was not showing the alternats for that contact.
Change-Id: I747ddd8a46c6e60a3068cb21d6e5ea16c2d9fd0a
hips/src/com/android/ex/chips/RecipientAlternatesAdapter.java
|
| c3af1324ab95cd3a02557b3ed82102f6be80d6ed |
25-Apr-2012 |
Mindy Pereira <mindyp@google.com> |
Fix alternates.
Change-Id: I2cd2a2f50696e3059d1b579e10eda5d6ad1fe50b
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| a0f2aab8f22b6f334938579cd6f336cfb338a554 |
25-Apr-2012 |
Mindy Pereira <mindyp@google.com> |
Check span before deleting.
Fixes b/6389344 gmail on JRN19F dies when I try to edit the To Email address in a bugreport
Change-Id: I84e7a01d2f443a08ae7708c87fb8ab9fdaa20e77
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 52648e440faa16e8d71b9c1568203f07fb3cb085 |
18-Apr-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
| 82c1c753695a3bfb8928ec1a3e11d9910b5f13fa |
17-Apr-2012 |
Tom Taylor <tomtaylor@google.com> |
Better support for phone numbers in Chips
Bug 6332661, 6321866
When in phone number phone, Chips needs to recognize numbers and not try
to parse the numbers as Rfc822Tokens.
Change-Id: Ib96ad310fae195776746e14e6e9ee57a85198d1a
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| cbdc88ebc883fe0200b85333ff90f7ac2865eecf |
16-Apr-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
| b3f2fd5eb1f4709ec95b9e03ce5466067ddc9894 |
14-Apr-2012 |
Eric Fischer <enf@google.com> |
Merge "Import translations. DO NOT MERGE"
|
| e7c0ab2de5aabfb98e7d2d6079fdb245810aff1d |
13-Apr-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE
Change-Id: I0042a5f71634c18609b4af66bf1526565b0c008b
hips/res/values-cs/strings.xml
hips/res/values-ms/strings.xml
hips/res/values-pl/strings.xml
hips/res/values-pt-rPT/strings.xml
hips/res/values-ru/strings.xml
hips/res/values-th/strings.xml
hips/res/values-tl/strings.xml
hips/res/values-tr/strings.xml
hips/res/values-zh-rTW/strings.xml
|
| a0dfbe7734af1ae8a0fc2d9d9aefb6d8da5398e3 |
13-Apr-2012 |
Daniel Lehmann <lehmannd@google.com> |
Removed ChipsUtil's increment features which are not ICS-and-up safe
Change-Id: Iaa05940c789ddfd4f37e5deb9e8e84c5cc28926f
hips/src/com/android/ex/chips/ChipsUtil.java
|
| 504d05509051ac639a5b92424a62e68f4a3dacec |
12-Apr-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
| 2495557ddeeea3c4a329edf0c8c65045fceaa955 |
11-Apr-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE
Change-Id: Ic5e23db7d7c9a47e8d6626f3b010afe657e359e4
hips/res/values-be/strings.xml
hips/res/values-bg/strings.xml
hips/res/values-ca/strings.xml
hips/res/values-es/strings.xml
hips/res/values-fa/strings.xml
hips/res/values-fi/strings.xml
hips/res/values-hr/strings.xml
hips/res/values-hu/strings.xml
hips/res/values-in/strings.xml
hips/res/values-ja/strings.xml
hips/res/values-ko/strings.xml
hips/res/values-pt-rPT/strings.xml
hips/res/values-pt/strings.xml
hips/res/values-ru/strings.xml
hips/res/values-sk/strings.xml
hips/res/values-sr/strings.xml
hips/res/values-sw/strings.xml
hips/res/values-vi/strings.xml
hips/res/values-zh-rCN/strings.xml
|
| 2e9adbf1f777b55cbc2e558f7bc6fae2783743de |
11-Apr-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
| c63d3465d7bc5f3207e064726ed9b9e84286788b |
10-Apr-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE
Change-Id: Id4e665e1129e78f3efe9624963acf3429eac7966
hips/res/values-af/strings.xml
hips/res/values-am/strings.xml
hips/res/values-ar/strings.xml
hips/res/values-da/strings.xml
hips/res/values-de/strings.xml
hips/res/values-el/strings.xml
hips/res/values-en-rGB/strings.xml
hips/res/values-es-rUS/strings.xml
hips/res/values-et/strings.xml
hips/res/values-fr/strings.xml
hips/res/values-hi/strings.xml
hips/res/values-it/strings.xml
hips/res/values-iw/strings.xml
hips/res/values-lt/strings.xml
hips/res/values-lv/strings.xml
hips/res/values-nb/strings.xml
hips/res/values-nl/strings.xml
hips/res/values-ro/strings.xml
hips/res/values-sl/strings.xml
hips/res/values-sv/strings.xml
hips/res/values-uk/strings.xml
hips/res/values-zu/strings.xml
|
| 9930c129133cb13f3227f1193ee2c91e88a676da |
10-Apr-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
| 88fd93ab0d29161f0a3e322ccb5569836426a74e |
09-Apr-2012 |
Eric Fischer <enf@google.com> |
Fix reference to renamed string.
Change-Id: Ifd863082b382e1f6fbe38735b50a527f1b6f5226
hips/res/layout/copy_chip_dialog_layout.xml
|
| fac09ce9fc1e12216d5b1f3d9c99711fbca72d6f |
09-Apr-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE
Change-Id: I36026f97c5dd74bae5e898d51d1fe52daac9ce58
hips/res/values-af/strings.xml
hips/res/values-am/strings.xml
hips/res/values-ar/strings.xml
hips/res/values-be/strings.xml
hips/res/values-bg/strings.xml
hips/res/values-ca/strings.xml
hips/res/values-cs/strings.xml
hips/res/values-da/strings.xml
hips/res/values-de/strings.xml
hips/res/values-el/strings.xml
hips/res/values-en-rGB/strings.xml
hips/res/values-es-rUS/strings.xml
hips/res/values-es/strings.xml
hips/res/values-et/strings.xml
hips/res/values-fa/strings.xml
hips/res/values-fi/strings.xml
hips/res/values-fr/strings.xml
hips/res/values-hi/strings.xml
hips/res/values-hr/strings.xml
hips/res/values-hu/strings.xml
hips/res/values-in/strings.xml
hips/res/values-it/strings.xml
hips/res/values-iw/strings.xml
hips/res/values-ja/strings.xml
hips/res/values-ko/strings.xml
hips/res/values-lt/strings.xml
hips/res/values-lv/strings.xml
hips/res/values-ms/strings.xml
hips/res/values-nb/strings.xml
hips/res/values-nl/strings.xml
hips/res/values-pl/strings.xml
hips/res/values-pt-rPT/strings.xml
hips/res/values-pt/strings.xml
hips/res/values-ro/strings.xml
hips/res/values-ru/strings.xml
hips/res/values-sk/strings.xml
hips/res/values-sl/strings.xml
hips/res/values-sr/strings.xml
hips/res/values-sv/strings.xml
hips/res/values-sw/strings.xml
hips/res/values-th/strings.xml
hips/res/values-tl/strings.xml
hips/res/values-tr/strings.xml
hips/res/values-uk/strings.xml
hips/res/values-vi/strings.xml
hips/res/values-zh-rCN/strings.xml
hips/res/values-zh-rTW/strings.xml
hips/res/values-zu/strings.xml
|
| 75f1f6994f77a6538c71df720aa2250fe71fed4b |
06-Apr-2012 |
Tom Taylor <tomtaylor@google.com> |
Support phone numbers in Chips UI
Bug 5066294
Add Zak's work for supporting phone numbers in the Chips UI. The default
remains email-centric, but the phone number option works great for
apps like Messaging.
Change-Id: I17cd8460f1b96f28ced8bbb32e145581dae6d807
hips/res/values/strings.xml
hips/src/com/android/ex/chips/BaseRecipientAdapter.java
hips/src/com/android/ex/chips/Queries.java
hips/src/com/android/ex/chips/RecipientAlternatesAdapter.java
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| b3c0e9125875d0f6ab9c4ca7b59a4e8c127f5aa1 |
03-Apr-2012 |
Mike Lockwood <lockwood@google.com> |
Merge remote-tracking branch 'goog/ics-aah'
|
| f81ab7921c0f3718c56afb8199031544e5561439 |
27-Mar-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
| 0bf0772111444b4b4d591344efc32c47f7646a5e |
27-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
Fix build
Change-Id: I998b4503bbc6b8ce2149e6801548749a54b237b2
ariablespeed/jni/Android.mk
|
| 5b0101036c7eb3100062e49c1101e0e3b5c7aab4 |
26-Mar-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
| 1fadc66d315b5fdebe7e2be3e76bbacd3cb86fad |
23-Mar-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE
Change-Id: I6ed4fd0b153689bf163d82c4b30879c2a1fb52c5
arousel/test/res/values-zh-rCN/strings.xml
|
| c3ecf53c685f3775be58b5c1ac6351362d221f9b |
05-Mar-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
| 430286ba80ebaa23ffa591cbbd6951d5f9fe69fa |
01-Mar-2012 |
Bjorn Bringert <bringert@android.com> |
Add getSuggestions() to Search
This is a copy of the hidden SearchManager.getSuggestions(),
which I plan to remove. It doesn't depend on any hidden APIs
and is purely a helper method.
Change-Id: I7915cdf327cca9f701e56bcedbf3f5388acf3a66
ommon/java/com/android/common/Search.java
|
| 806a51372a75c9c84af4c844b80e23796a3ebd78 |
27-Feb-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
| 698c55f3a36fe972b381ad216dc5de3760936858 |
24-Feb-2012 |
Tom Wilson <tomwilson@google.com> |
Adding minor tweaks to SQLiteContentProvider.
Allows sub-classes to specify a max number of batch operations, and
makes this data accessible as a public method.
Change-Id: I3d1cb7b996b23e45b479613b0af4f01a8a641f04
ommon/java/com/android/common/content/SQLiteContentProvider.java
|
| ddf93921e3a7c4c41326036df7242118ffdafbb3 |
23-Feb-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 1797928f: am f1442113: Reconcile with ics-mr1-release
* commit '1797928f7ad9c901a79a0367564e471657587ca3':
|
| 8e018f7417a5e9e1ffdeca9c654ec3043d362e53 |
23-Feb-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 98409c29: am 4d4a7290: Reconcile with ics-mr1-release
* commit '98409c2983215a7808f1ecbf8af95c3d0d94ab21':
|
| c229c54ae6224098e6416b8c5ab7a405ca216f2a |
23-Feb-2012 |
Mindy Pereira <mindyp@google.com> |
am 26c55bfa: am 2ac4969e: am 665ba9e4: Don\'t adjust scroll on focus changes.
* commit '26c55bfab74312ea192532d6e8748ae1da26692c':
|
| 2b34f22154da3a0c0df951d65c3250a1b11e1ed1 |
23-Feb-2012 |
Mindy Pereira <mindyp@google.com> |
am e67e5aab: am 06b38bf7: am 665ba9e4: Don\'t adjust scroll on focus changes.
* commit 'e67e5aabd555f3862d8f8e640582d63a6f46357d':
Don't adjust scroll on focus changes.
|
| 1797928f7ad9c901a79a0367564e471657587ca3 |
22-Feb-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am f1442113: Reconcile with ics-mr1-release
* commit 'f1442113eb2acdf5e2d2bdd6c526d35b16f6a5d7':
|
| 98409c2983215a7808f1ecbf8af95c3d0d94ab21 |
22-Feb-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 4d4a7290: Reconcile with ics-mr1-release
* commit '4d4a7290e781aa00cfa06210c067361517e3e523':
|
| f1442113eb2acdf5e2d2bdd6c526d35b16f6a5d7 |
22-Feb-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-mr1-release
Change-Id: I3b5be1bb6925798897f759da0213a0ec929b252f
|
| 4d4a7290e781aa00cfa06210c067361517e3e523 |
22-Feb-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-mr1-release
Change-Id: I01a3888fdf779a25d1bea8101c19094d5207592a
|
| ecbe4bd029872a15df8f2e8cf45d568b19cc3bd4 |
22-Feb-2012 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
| bc54412a65b04d03c83981ba10ceb18fa5442d9d |
21-Feb-2012 |
Mindy Pereira <mindyp@google.com> |
am e6a2c26b: (-s ours) Don\'t adjust scroll on focus changes. DO NOT MERGE
* commit 'e6a2c26bfe081ceec535358c8f36a556602b758a':
Don't adjust scroll on focus changes. DO NOT MERGE
|
| e6a2c26bfe081ceec535358c8f36a556602b758a |
21-Feb-2012 |
Mindy Pereira <mindyp@google.com> |
Don't adjust scroll on focus changes. DO NOT MERGE
Fixes b/6037251 Switching input fields causes line loss
Since the ime suggestions area may also be going up/ down
we can't really trust offset measurements. Adamp says
this should be addressed in the j timeframe.
Cherry-pick of CL: https://android-git.corp.google.com/g/167021
Change-Id: I57c260f182bfd534323359521f7ed2558be860e8
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 26c55bfab74312ea192532d6e8748ae1da26692c |
21-Feb-2012 |
Mindy Pereira <mindyp@google.com> |
am 2ac4969e: am 665ba9e4: Don\'t adjust scroll on focus changes.
* commit '2ac4969e0940bd0352a8a517876349334c8e25eb':
|
| e67e5aabd555f3862d8f8e640582d63a6f46357d |
21-Feb-2012 |
Mindy Pereira <mindyp@google.com> |
am 06b38bf7: am 665ba9e4: Don\'t adjust scroll on focus changes.
* commit '06b38bf767854d275a8ecc730e3d0906aa989791':
Don't adjust scroll on focus changes.
|
| 2ac4969e0940bd0352a8a517876349334c8e25eb |
21-Feb-2012 |
Mindy Pereira <mindyp@google.com> |
am 665ba9e4: Don\'t adjust scroll on focus changes.
* commit '665ba9e4ef5a8af30cffe6df6baee7e311dd0e65':
Don't adjust scroll on focus changes.
|
| cd81bbcc918dc941a8ac7aa245844a76192d9af1 |
21-Feb-2012 |
Mindy Pereira <mindyp@google.com> |
am 665ba9e4: Don\'t adjust scroll on focus changes.
* commit '665ba9e4ef5a8af30cffe6df6baee7e311dd0e65':
Don't adjust scroll on focus changes.
|
| 06b38bf767854d275a8ecc730e3d0906aa989791 |
21-Feb-2012 |
Mindy Pereira <mindyp@google.com> |
am 665ba9e4: Don\'t adjust scroll on focus changes.
* commit '665ba9e4ef5a8af30cffe6df6baee7e311dd0e65':
Don't adjust scroll on focus changes.
|
| 665ba9e4ef5a8af30cffe6df6baee7e311dd0e65 |
21-Feb-2012 |
Mindy Pereira <mindyp@google.com> |
Don't adjust scroll on focus changes.
Fixes b/6037251 Switching input fields causes line loss
Since the ime suggestions area may also be going up/ down
we can't really trust offset measurements. Adamp says
this should be addressed in the j timeframe.
Change-Id: I5f5eeb33e0fd9397873451cb1d1325deb451542d
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 4a9c1fe0460a9b3cbf589914e0d900cbc23bb471 |
20-Feb-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
| 3e5e6a82323788b1ae41f11501c9044bd2eb3a7f |
17-Feb-2012 |
Mindy Pereira <mindyp@google.com> |
Merge "Make sure we don't run off the end when deleting chips."
|
| a7ae9beadd2ae677d028edbadf55b02220cb3fb6 |
17-Feb-2012 |
Mindy Pereira <mindyp@google.com> |
Make sure we don't run off the end when deleting chips.
Fixes b/5997197 Gmail crash when trying to delete the address chip [IOBE at android.text.SpannableStringBuilder.checkRange]
Change-Id: I931da8017a92f145c13f36c765613f16fecf97ab
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 89e88da74e77c0d037d95fd1f5b90dc6b6c6d78b |
16-Feb-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 6c49ee03: am 0f3e201a: Reconcile with ics-mr1-release
* commit '6c49ee0370af045b165340a1f18b42e55a990928':
|
| 725a2c704e0fa185bc4bfc98d59a8139a31dd2f9 |
16-Feb-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 28b7084e: am 06afcb06: Reconcile with ics-mr1-release
* commit '28b7084e34b3ea7944eec326e029e0ac9142d150':
|
| 6c49ee0370af045b165340a1f18b42e55a990928 |
16-Feb-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 0f3e201a: Reconcile with ics-mr1-release
* commit '0f3e201ad02d2823ec608eba0955f17bfbe79754':
|
| 0f3e201ad02d2823ec608eba0955f17bfbe79754 |
16-Feb-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-mr1-release
Change-Id: I448f1bca44d748f10678ae1cb30c8df716da0495
|
| 28b7084e34b3ea7944eec326e029e0ac9142d150 |
16-Feb-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 06afcb06: Reconcile with ics-mr1-release
* commit '06afcb062856430b3c439da212062735112a8ce8':
|
| 06afcb062856430b3c439da212062735112a8ce8 |
16-Feb-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-mr1-release
Change-Id: I32db13dfef18939519baeae88bf7974d5c5291d4
|
| d5338a75f0cc93676bfed8675f5708974d52d378 |
14-Feb-2012 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
| 2a68f19ca2d46ac6e1b23be2e32eb07873849523 |
10-Feb-2012 |
Eric Fischer <enf@google.com> |
am 652925d7: (-s ours) am 67e21b4b: am 8313b3a5: Import translations. DO NOT MERGE
* commit '652925d7e17d9aafc64cca6bd26541461de29f69':
|
| 652925d7e17d9aafc64cca6bd26541461de29f69 |
10-Feb-2012 |
Eric Fischer <enf@google.com> |
am 67e21b4b: am 8313b3a5: Import translations. DO NOT MERGE
* commit '67e21b4b196a3027f5ee9f84490c949c9a1ea42e':
|
| 51c7e09666e7643550dc0fd7606f1bebef452937 |
10-Feb-2012 |
Eric Fischer <enf@google.com> |
am 380a3665: (-s ours) am 249a5b28: (-s ours) am 8313b3a5: Import translations. DO NOT MERGE
* commit '380a36651dda981421ca2cce1af6c7b9befeb2f8':
Import translations. DO NOT MERGE
|
| 380a36651dda981421ca2cce1af6c7b9befeb2f8 |
10-Feb-2012 |
Eric Fischer <enf@google.com> |
am 249a5b28: (-s ours) am 8313b3a5: Import translations. DO NOT MERGE
* commit '249a5b2844bb0959d72a634df6e9dc24d7596a32':
Import translations. DO NOT MERGE
|
| 67e21b4b196a3027f5ee9f84490c949c9a1ea42e |
10-Feb-2012 |
Eric Fischer <enf@google.com> |
am 8313b3a5: Import translations. DO NOT MERGE
* commit '8313b3a5881f35ffbdec3a951380ab82c978da60':
Import translations. DO NOT MERGE
|
| 8b8418ceb2cff902b5ce0f6bad3fe8d28540e3df |
10-Feb-2012 |
Eric Fischer <enf@google.com> |
am 8313b3a5: Import translations. DO NOT MERGE
* commit '8313b3a5881f35ffbdec3a951380ab82c978da60':
Import translations. DO NOT MERGE
|
| 249a5b2844bb0959d72a634df6e9dc24d7596a32 |
10-Feb-2012 |
Eric Fischer <enf@google.com> |
am 8313b3a5: Import translations. DO NOT MERGE
* commit '8313b3a5881f35ffbdec3a951380ab82c978da60':
Import translations. DO NOT MERGE
|
| 8313b3a5881f35ffbdec3a951380ab82c978da60 |
09-Feb-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE
Change-Id: Iedfbbd2aae43c310d02fbb9101779f65fa6d1ff1
arousel/test/res/values-de/strings.xml
hips/res/values-es-rUS/strings.xml
|
| 640773509142d3061cc7f8dc3b827b4455a1e91d |
07-Feb-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
| 2f0b1d914ed2f24504c8a315d42324d6e311f236 |
06-Feb-2012 |
Mindy Pereira <mindyp@google.com> |
am e3639877: (-s ours) DO NOT MERGE. Need to set the resource for the dialog.
* commit 'e36398774cb6835d4e5f2bf40da464d55405b20f':
DO NOT MERGE. Need to set the resource for the dialog.
|
| 41d9d293eafb5161f968276d955ba001c5c15388 |
06-Feb-2012 |
Mindy Pereira <mindyp@google.com> |
am 2cf1863b: (-s ours) DO NOT MERGE Dont sanitize before/ after/ between chips while waiting to create pending chips.
* commit '2cf1863bb9878d2cd6890d0ef9690c8cfcd9aee0':
DO NOT MERGE Dont sanitize before/ after/ between chips while waiting to create pending chips.
|
| eb83a7dfc716851d1dc0cc160191cdda8f064e35 |
06-Feb-2012 |
Mindy Pereira <mindyp@google.com> |
Since the delete key can't be guaranteed, use text changed listeners.
Per IME team, the delete key isn't/ was never guaranteed to be sent.
Therefore, I cannot depend on the QwertyKeyListener
Therefore, I am working around them
Change-Id: I2dea39beee22f7c181be2b33b7be66a388f42262
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 6d7a3f1d5def1590f5a1d40a48c964cd982fb553 |
06-Feb-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
| 1bbb28a292c69ca692d821f1fb55a44111f32795 |
04-Feb-2012 |
Mindy Pereira <mindyp@google.com> |
Merge "Need to set the resource for the dialog."
|
| bf342b7d5efcc3284f2b790b0ccd9defc1ddb7e2 |
04-Feb-2012 |
Mindy Pereira <mindyp@google.com> |
Need to set the resource for the dialog.
Fixes b/5965686 hc/ics unbundled gmail: long press on contact chip causes crash
Change-Id: I186a0a1e84a29f48060a3f855a08017f41b93463
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| e36398774cb6835d4e5f2bf40da464d55405b20f |
04-Feb-2012 |
Mindy Pereira <mindyp@google.com> |
DO NOT MERGE. Need to set the resource for the dialog.
Fixes b/5965686 hc/ics unbundled gmail: long press on contact chip causes crash
Change-Id: I55c35d48800eb6436d646b38092d52d9873b2bee
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 30d1edd30d0571a4b6866e04c3e674e7c3d414e3 |
01-Feb-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am d5340998: am eb0b1711: Reconcile with ics-mr1-release
* commit 'd5340998a0de2b2029934bd5b87436ed0b37930d':
|
| d5340998a0de2b2029934bd5b87436ed0b37930d |
01-Feb-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am eb0b1711: Reconcile with ics-mr1-release
* commit 'eb0b1711dde13fbf3f24977f82792acc6a23427d':
|
| eb0b1711dde13fbf3f24977f82792acc6a23427d |
01-Feb-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-mr1-release
Change-Id: Ic3d782ec1cb121fa031be68683d42e0802f42386
|
| 3890f2994ca5953fe447239652821e7294813f75 |
30-Jan-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
| aa3e361a97b86419cb976f71ff487058f564febf |
26-Jan-2012 |
Eric Fischer <enf@google.com> |
Merge "Import translations. DO NOT MERGE"
|
| 1266666adc2ffb6b58571aa84dc8a90d337567d8 |
26-Jan-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE
Change-Id: I8152bb3674fbaff7f73649a682e6331136337c67
hips/res/values-es-rUS/strings.xml
|
| 2e07adb85194abf5b1264aad95b421558f41a5ba |
26-Jan-2012 |
Dave Santoro <dsantoro@google.com> |
Add an addAll(String[]) method to ProjectionMap.
This is useful if the columns for a table are already declared in
a String[].
Change-Id: I0140081f149a6354984bf3eb1cb3763f5edf369b
ommon/java/com/android/common/content/ProjectionMap.java
|
| 66e1d4ba9cc994dd2dda1260a881fe22075a6163 |
12-Jan-2012 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| b61ab80aa10c3a7321a7c364b5c28a3cd362981e |
12-Jan-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am e1e02a51: Reconcile with ics-mr1-release
* commit 'e1e02a51b1de3211ba47bc5ffbe52e9c358f06b3':
|
| e1e02a51b1de3211ba47bc5ffbe52e9c358f06b3 |
12-Jan-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-mr1-release
Change-Id: I286607d4bc4441a379d78c2a0cdb166e41dc47ee
|
| 0753f90e71419fc206069ae8a61e41b811083fb5 |
12-Jan-2012 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
| 33435aebe45ba2b6711a933515fec142d0b809ce |
12-Jan-2012 |
Mindy Pereira <mindyp@google.com> |
Merge "Make chips less fragile for testing purposes."
|
| d086b83ffa568b592ee6f20445ad3f8d50ab834a |
11-Jan-2012 |
Mindy Pereira <mindyp@google.com> |
Make chips less fragile for testing purposes.
There might not be a tokenizer.
Change-Id: I356b1e901742f86dca0822720ee0cb7dfb7a31fb
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| f01e4614c95d33cb9370816a9d34282f41e5d886 |
11-Jan-2012 |
Mindy Pereira <mindyp@google.com> |
am d55e046b: (-s ours) am a8065d50: DO NOT MERGE. Dont sanitize before/ after/ between chips while waiting to create pending chips.
* commit 'd55e046b1b917519026ae12dac19bec5d16477e6':
DO NOT MERGE. Dont sanitize before/ after/ between chips while waiting to create pending chips.
|
| 8bcc8530c8e9d4277c603e2dec93f76f869c648d |
11-Jan-2012 |
Mindy Pereira <mindyp@google.com> |
am a8065d50: DO NOT MERGE. Dont sanitize before/ after/ between chips while waiting to create pending chips.
* commit 'a8065d50c1a9561375661d5eb32db2fd23750bc9':
DO NOT MERGE. Dont sanitize before/ after/ between chips while waiting to create pending chips.
|
| d55e046b1b917519026ae12dac19bec5d16477e6 |
11-Jan-2012 |
Mindy Pereira <mindyp@google.com> |
am a8065d50: DO NOT MERGE. Dont sanitize before/ after/ between chips while waiting to create pending chips.
* commit 'a8065d50c1a9561375661d5eb32db2fd23750bc9':
DO NOT MERGE. Dont sanitize before/ after/ between chips while waiting to create pending chips.
|
| 9b5ccb665fe9ab3c18dea572ccb296529ce5a64f |
11-Jan-2012 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| 2cf1863bb9878d2cd6890d0ef9690c8cfcd9aee0 |
10-Jan-2012 |
Mindy Pereira <mindyp@google.com> |
DO NOT MERGE Dont sanitize before/ after/ between chips while waiting to create pending chips.
fixes b/5848985 if you try to add a new recipient before other chips have resolved, the existing recipients get erased
cherry-pick of https://android-git.corp.google.com/g/157784
Change-Id: I457672ef951246707a18a04716fd6bf29da4861b
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| a8065d50c1a9561375661d5eb32db2fd23750bc9 |
10-Jan-2012 |
Mindy Pereira <mindyp@google.com> |
DO NOT MERGE. Dont sanitize before/ after/ between chips while waiting to create pending chips.
fixes b/5848985 if you try to add a new recipient before other chips have resolved, the existing recipients get erased
Change-Id: Ic1bdb5f6632158e19d38c35ffc527dabbf55dd36
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 2302f672de1b8e7c205412397b0b79514f5426c3 |
10-Jan-2012 |
Mindy Pereira <mindyp@google.com> |
Dont sanitize before/ after/ between chips while waiting to create pending chips.
fixes b/5848985 if you try to add a new recipient before other chips have resolved, the existing recipients get erased
Change-Id: Ic1bdb5f6632158e19d38c35ffc527dabbf55dd36
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| cfb7b059f94a9a2b18a649aea153ddf48b267aaf |
02-Jan-2012 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| 5b1af35d765b2a22033e4eb5e8d9bb650d690108 |
29-Dec-2011 |
Eric Fischer <enf@google.com> |
Import revised translations.
Change-Id: I43380ab215b529e1f23c76fb58f2ff1fbfeee180
arousel/test/res/values-de/strings.xml
|
| b156c1876d570bdaf776e8e1e1e840da38c352e4 |
22-Dec-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| e8245de2b5bf9c295565ec7aa3a8697d7d969469 |
22-Dec-2011 |
Conley Owens <cco3@android.com> |
am f7da24b3: Make static fields of DUSU package-private
* commit 'f7da24b37a0c94e9bfb5e317548999d418fb12ae':
Make static fields of DUSU$DUF package-private
|
| f7da24b37a0c94e9bfb5e317548999d418fb12ae |
20-Dec-2011 |
Conley Owens <cco3@android.com> |
Make static fields of DUSU$DUF package-private
DataUsageStatUpdater$DataUsageFeedback
This makes a little more sense since they are accessed outside of the
class that they are defined in.
In addition, this fixes errors created by proguard when building with
OpenJDK.
Change-Id: I2c2c514e83fbf789cca59a8ff11df9fd0ac7ffda
ommon/java/com/android/common/contacts/DataUsageStatUpdater.java
|
| 834897fa6d4c3235840f44477635096575b30029 |
19-Dec-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| 407f669c2d2108e6732c41b53f5d12355c92bb49 |
16-Dec-2011 |
Mindy Pereira <mindyp@google.com> |
Make attributes related to chip backgrounds styleable.
Change-Id: I8d4f944e91e12f2a0779ac863c1862110dffb832
hips/res/values/attrs.xml
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 3da5aa0ceb8e870d43fa6747330064d6ddf4775e |
16-Dec-2011 |
Mindy Pereira <mindyp@google.com> |
Add styleable attributes to chips. This first one is a test.
We will need this in order to be able to support both dark and
light themes for chips fields. If nothing is specified, just falls
back to the default background.
Change-Id: Ibc0e5391969bfee1615b14bafe83f065d81c6331
hips/res/values/attrs.xml
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| a11c2b0e1ea043aa4d8745285f2dcbe20448b417 |
15-Dec-2011 |
Mindy Pereira <mindyp@google.com> |
Update build file to allow us to have resources in static libs.
Depends on: Change Ifb4d2300: Support to build static Java library with Android resource
Change-Id: Ie1ac8c93cb3f12a7d4e9afd873a13607ed72b932
hips/Android.mk
hips/AndroidManifest.xml
hips/src/com/android/ex/chips/BaseRecipientAdapter.java
hips/src/com/android/ex/chips/RecipientAlternatesAdapter.java
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 46e31f3855b8029db9c3eccc1b2a6b6c345691b4 |
14-Dec-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| 0c980c3f851ee251e8914ae439403acf3c446268 |
13-Dec-2011 |
Jeff Hamilton <jham@google.com> |
Merge "Moving ProjectionMap into frameworks/ex."
|
| d2fda1ec4db8d261bf0f5ca6dc43f8c204edbd87 |
13-Dec-2011 |
Dave Santoro <dsantoro@google.com> |
Moving ProjectionMap into frameworks/ex.
Change-Id: Ida7831c961dd4a132e6c5bb3fffacceca2f41d44
ommon/java/com/android/common/content/ProjectionMap.java
|
| 07a230a45345b16793463e32194f820eafa2a626 |
13-Dec-2011 |
Mindy Pereira <mindyp@google.com> |
If there is no tokenizer, don't bother shrinking.
Unlikely case, but found it while creating a new app.
Change-Id: I15e37791530044c990e3e1d6b36348fe85258df1
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 07d4ab7e6dc069cc4df6b0e819ff3d94ea00421f |
09-Dec-2011 |
The Android Open Source Project <initial-contribution@android.com> |
am de40b0c3: Reconcile with ics-mr1-release
* commit 'de40b0c3f5950b331ad5e3e39766a2404fbb3ba9':
|
| de40b0c3f5950b331ad5e3e39766a2404fbb3ba9 |
08-Dec-2011 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-mr1-release
Change-Id: I5ca90003ee32b56aea305c0f3d56d771977db8cb
|
| bec9dc9915501e9f924cf8c2f62901c38ddf5c98 |
07-Dec-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| 039c9266e72538fd40d382de56807408385fc3da |
07-Dec-2011 |
Mindy Pereira <mindyp@google.com> |
Make sure there is a recipient to replace before adding an entry for it.
Its possible if the chip is moved between fields that there was no original
recipient to replace.
Fixes b/5720810 Crash on drag & drop recipient to cc & bcc fields
Change-Id: Ide0a498fb63886a9afc2522649442d6ce62ed98c
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 45a6944d5b611492761ad643bd58530c2b7fda26 |
30-Nov-2011 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-mr1-release
Change-Id: I8531464338db93cc4f48004b3fbe053085763bf8
|
| a2b85c8e9eb30e12a46d1c7dc6d484bd26004c0a |
30-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| 2289d75f7ba29d91c695e0723ac2894a12649d37 |
30-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
| a3ea5e05ea8eb8ab1e62ff59734a2d64453a3ea4 |
29-Nov-2011 |
Eric Fischer <enf@google.com> |
am dbbedc12: Import revised translations. DO NOT MERGE
* commit 'dbbedc12e99acc1d006d819a9b539fd0f9ad044d':
Import revised translations. DO NOT MERGE
|
| 6fada8e7746d13ac0bbfb5d53e8966c12d2c29b1 |
29-Nov-2011 |
Eric Fischer <enf@google.com> |
am dbbedc12: (-s ours) Import revised translations. DO NOT MERGE
* commit 'dbbedc12e99acc1d006d819a9b539fd0f9ad044d':
Import revised translations. DO NOT MERGE
|
| dbbedc12e99acc1d006d819a9b539fd0f9ad044d |
29-Nov-2011 |
Eric Fischer <enf@google.com> |
Import revised translations. DO NOT MERGE
Change-Id: Ic58a6c578c1fb4e7d5bf7b3539ff5676d8b3d34c
arousel/test/res/values-zh-rCN/strings.xml
|
| 5758ccdcac0233ee04d7f11b9dce843d7c73973b |
29-Nov-2011 |
Eric Fischer <enf@google.com> |
Import revised translations.
Change-Id: I880296bb76b6a1d7226541b7587ae650182dd75d
arousel/test/res/values-zh-rCN/strings.xml
hips/res/values-da/strings.xml
|
| f186f8fbdea3a1716cba4af62ef27cdd4410c80d |
28-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| 2c0485a3bb2c4435600ff74c0e0121d584b1b43d |
19-Nov-2011 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-mr1-release
Change-Id: Ia6db525f24e53b9730225194d728a82006ab528f
|
| 83aeec8f707e5653646d4d8e83177046771ecc75 |
18-Nov-2011 |
Andy Huang <ath@google.com> |
drive-by fixes for compiler warnings
Change-Id: Ibb32bf4f49cc9c48d6d02e664f48f838c7024f91
hips/src/com/android/ex/chips/BaseRecipientAdapter.java
|
| ec35d9975b61c84cda7081ebfce9e017229fb3d5 |
17-Nov-2011 |
Mindy Pereira <mindyp@google.com> |
Verify that the start of the delete sequence is before the end.
Fixes b/5541436 java.lang.IndexOutOfBoundsException: replace (23 ... 0) has end before start
Change-Id: Ic39d41d53fe59e4c19fc9b2d4af265791b165986
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| aa6bdcb4ef3efbc9e8d69267a62ff84b3d42db58 |
17-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| e864475e662c92d1022f7bb90dae8f3f8724b07c |
17-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
| 1704bcd48dc1b138574515b19892f7348f346985 |
17-Nov-2011 |
Bryan Mawhinney <bryanmawhinney@google.com> |
am 12a2021d: Merge "Port ICS tilt-style overscroll from java to rs" into ics-mr1
* commit '12a2021dffc791a04fb00301684939e012a96433':
Port ICS tilt-style overscroll from java to rs
|
| b58a305026d37bba2fc473ff72ddc9a4fceb8b1e |
16-Nov-2011 |
Bryan Mawhinney <bryanmawhinney@google.com> |
am 12a2021d: Merge "Port ICS tilt-style overscroll from java to rs" into ics-mr1
* commit '12a2021dffc791a04fb00301684939e012a96433':
Port ICS tilt-style overscroll from java to rs
|
| 12a2021dffc791a04fb00301684939e012a96433 |
16-Nov-2011 |
Bryan Mawhinney <bryanmawhinney@google.com> |
Merge "Port ICS tilt-style overscroll from java to rs" into ics-mr1
|
| fd7eadbf359a46baf6dc303457774f7b19d856e0 |
16-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| 38885d8784894cc8795bd6d80b27480c8c4261cd |
16-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
| cd7d3b4db9d8ad6c56ce6ac9e865d05ee69c9b4c |
16-Nov-2011 |
Mindy Pereira <mindyp@google.com> |
am 1edbbadd: Merge "Make sure we correctly identify an edit vs a commit" into ics-mr1
* commit '1edbbadd5b56177e83fc46331e51443afd2ae3cd':
Make sure we correctly identify an edit vs a commit
|
| 5dac0398c2684197a4363f15cef292fee126038f |
15-Nov-2011 |
Bryan Mawhinney <bryanmawhinney@google.com> |
Port ICS tilt-style overscroll from java to rs
Code follows the java implementation as closely as possible to make
comparisons and future bug fixes easy.
Bug: 5613515
Change-Id: I14db2f2d659be919b4b12e5a7fe53af7ec137467
arousel/java/com/android/ex/carousel/carousel.rs
|
| f91a6f76103a02d3bf4677ca7fce66189d608b95 |
16-Nov-2011 |
Mindy Pereira <mindyp@google.com> |
am 1edbbadd: Merge "Make sure we correctly identify an edit vs a commit" into ics-mr1
* commit '1edbbadd5b56177e83fc46331e51443afd2ae3cd':
Make sure we correctly identify an edit vs a commit
|
| 1edbbadd5b56177e83fc46331e51443afd2ae3cd |
16-Nov-2011 |
Mindy Pereira <mindyp@google.com> |
Merge "Make sure we correctly identify an edit vs a commit" into ics-mr1
|
| 4ef6086da2f4bcac5a6cba773f828734a399a879 |
16-Nov-2011 |
Mindy Pereira <mindyp@google.com> |
Make sure we correctly identify an edit vs a commit
Fixes b/5615358 At the end of the recipient's email address, some additional texts (ex. j@gmail.com or just @gmail.com) were randomly added
Change-Id: Ie40012ee91f8a570ce6952364c70237078a2d759
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 8c73e9c53809687faa1809e5001ee9252da8a1a9 |
15-Nov-2011 |
Eric Fischer <enf@google.com> |
am 3de81668: (-s ours) am 165ab0b4: Import revised translations. DO NOT MERGE
* commit '3de816687e596b980a84e8e1a07b9666e3ac7a34':
Import revised translations. DO NOT MERGE
|
| 05fc14c9233301bffb8746d26b358b62fffc98ad |
15-Nov-2011 |
Eric Fischer <enf@google.com> |
am 3de81668: am 165ab0b4: Import revised translations. DO NOT MERGE
* commit '3de816687e596b980a84e8e1a07b9666e3ac7a34':
Import revised translations. DO NOT MERGE
|
| 3de816687e596b980a84e8e1a07b9666e3ac7a34 |
15-Nov-2011 |
Eric Fischer <enf@google.com> |
am 165ab0b4: Import revised translations. DO NOT MERGE
* commit '165ab0b4d19c7d1e0230b51f6ca4eb0b52a24bcd':
Import revised translations. DO NOT MERGE
|
| 165ab0b4d19c7d1e0230b51f6ca4eb0b52a24bcd |
14-Nov-2011 |
Eric Fischer <enf@google.com> |
Import revised translations. DO NOT MERGE
Change-Id: I2e4349b6e7417c59157e5afc365d7dd8c48281bc
hips/res/values-da/strings.xml
|
| c55f3e2d88912b2e0d2d2920ca83a6529d701929 |
07-Nov-2011 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-mr1-release
Change-Id: Ib22d003f57411882c72d8c1d2df64b16945dbf6d
|
| c4016678d470a8753f2bc0b397c0b76a625391dc |
06-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| 8e3a839331006ed4aff88027f07b1238bb091bd7 |
06-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
| 32e22a8f9e99c5cce4702fc40b57921ec67681de |
04-Nov-2011 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-mr1-release
Change-Id: I5b4f3e6c7d38b626720a14db97a8dbd08b90a594
|
| e4e80fb37274af0f4506236ca3ca9cb69c328e80 |
03-Nov-2011 |
Bryan Mawhinney <bryanmawhinney@google.com> |
am f2809a6d: (-s ours) am f892e2dd: (-s ours) Set carousel LOCAL_SDK_VERSION to 14. DO NOT MERGE.
* commit 'f2809a6d49ffd3d1e2d819718d6a5d7995925850':
Set carousel LOCAL_SDK_VERSION to 14. DO NOT MERGE.
|
| 19dff5792c70e54c7c389b9598818757aa6cc1f2 |
03-Nov-2011 |
Bryan Mawhinney <bryanmawhinney@google.com> |
am f2809a6d: am f892e2dd: (-s ours) Set carousel LOCAL_SDK_VERSION to 14. DO NOT MERGE.
* commit 'f2809a6d49ffd3d1e2d819718d6a5d7995925850':
Set carousel LOCAL_SDK_VERSION to 14. DO NOT MERGE.
|
| f2809a6d49ffd3d1e2d819718d6a5d7995925850 |
03-Nov-2011 |
Bryan Mawhinney <bryanmawhinney@google.com> |
am f892e2dd: (-s ours) Set carousel LOCAL_SDK_VERSION to 14. DO NOT MERGE.
* commit 'f892e2dd1b17ab352b578ac301041562f8bdf666':
Set carousel LOCAL_SDK_VERSION to 14. DO NOT MERGE.
|
| 6c6ba8e108fd376df7efe4498dcc815a216ef9ea |
03-Nov-2011 |
Mindy Pereira <mindyp@google.com> |
am 8faa56ff: If message starts with > 50 chips, dont chipify anything.
* commit '8faa56ff909edb20154219f8d2ba6feecf1b5238':
If message starts with > 50 chips, dont chipify anything.
|
| 6be72e39f39af1c524c40c0d365ec13dc1398380 |
03-Nov-2011 |
Mindy Pereira <mindyp@google.com> |
am 8faa56ff: If message starts with > 50 chips, dont chipify anything.
* commit '8faa56ff909edb20154219f8d2ba6feecf1b5238':
If message starts with > 50 chips, dont chipify anything.
|
| c6d994245fd9894ba7bf193d9efd860ec91277a1 |
03-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| f892e2dd1b17ab352b578ac301041562f8bdf666 |
03-Nov-2011 |
Bryan Mawhinney <bryanmawhinney@google.com> |
Set carousel LOCAL_SDK_VERSION to 14. DO NOT MERGE.
This allows unbundled apps to build against the ICS version of the
carousel.
Change-Id: I7b44ff11243fe4496afe35f8752973138b82fa43
arousel/Android.mk
|
| 8faa56ff909edb20154219f8d2ba6feecf1b5238 |
02-Nov-2011 |
Mindy Pereira <mindyp@google.com> |
If message starts with > 50 chips, dont chipify anything.
Also added test cases for new plain text version when there are too many
recips.
fixes b/5556474 Gmail ANR when replyi-all to a msg with many recipients
Change-Id: I69ba560bf8d8112b81a582aee17a07bf3da1aa65
hips/src/com/android/ex/chips/RecipientEditTextView.java
hips/tests/src/com/android/ex/chips/ChipsTest.java
|
| 0b081e40ae6ebb1f380799babea560baecb51905 |
02-Nov-2011 |
Eric Fischer <enf@google.com> |
Merge "Import revised translations."
|
| 6f773db7b835b9d31054e88e7790878df682edd7 |
02-Nov-2011 |
Eric Fischer <enf@google.com> |
am 1d1940c6: Merge "Import revised translations." into ics-mr1
* commit '1d1940c6f20552fee84662cbb473d24d93f1f8f1':
Import revised translations.
|
| 37cda510680cbd2c51d5b34932ef73054cc3a03d |
02-Nov-2011 |
Mindy Pereira <mindyp@google.com> |
am 16770784: Merge "Cleanup offsets for tablet and crespo chips dropdown" into ics-mr1
* commit '16770784e15e2c34000226e29f33b13695103df5':
Cleanup offsets for tablet and crespo chips dropdown
|
| 727cab5ee53fa6b83bff61c7926d4c14647905d2 |
02-Nov-2011 |
Mindy Pereira <mindyp@google.com> |
am 01821f44: Merge "Protect against negative offsets when calling replace." into ics-mr1
* commit '01821f44b0d2a518cc5f5635bb0456d04064804a':
Protect against negative offsets when calling replace.
|
| 105cf4c7648453128d480085ef2436c246bd342a |
02-Nov-2011 |
Eric Fischer <enf@google.com> |
Import revised translations.
Change-Id: I3ab40255d28538f7cafba070a7cee04956df06da
arousel/test/res/values-be/strings.xml
arousel/test/res/values-et/strings.xml
hips/res/values-be/strings.xml
hips/res/values-et/strings.xml
|
| 9acfade89a26747fe0276a58c2f769881ddc8511 |
02-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
| e297a3f918ff19ba5aa143868d1ca4c7c0940969 |
01-Nov-2011 |
Eric Fischer <enf@google.com> |
am 1d1940c6: Merge "Import revised translations." into ics-mr1
* commit '1d1940c6f20552fee84662cbb473d24d93f1f8f1':
Import revised translations.
|
| 1d1940c6f20552fee84662cbb473d24d93f1f8f1 |
01-Nov-2011 |
Eric Fischer <enf@google.com> |
Merge "Import revised translations." into ics-mr1
|
| ed2ce847b33c922a26c634563f4f60c1de9c66b8 |
01-Nov-2011 |
Eric Fischer <enf@google.com> |
Import revised translations.
Change-Id: I958131674c746b90d62b6e428b65e554983c52f6
arousel/test/res/values-be/strings.xml
arousel/test/res/values-et/strings.xml
hips/res/values-be/strings.xml
hips/res/values-et/strings.xml
|
| 7b4782b3b4a595c7c52b148099604308d1d3b7da |
01-Nov-2011 |
Mindy Pereira <mindyp@google.com> |
am 16770784: Merge "Cleanup offsets for tablet and crespo chips dropdown" into ics-mr1
* commit '16770784e15e2c34000226e29f33b13695103df5':
Cleanup offsets for tablet and crespo chips dropdown
|
| 16770784e15e2c34000226e29f33b13695103df5 |
01-Nov-2011 |
Mindy Pereira <mindyp@google.com> |
Merge "Cleanup offsets for tablet and crespo chips dropdown" into ics-mr1
|
| 708e23ffcc1bca889f7c528633dfe0f295ed9304 |
01-Nov-2011 |
Mindy Pereira <mindyp@google.com> |
Cleanup offsets for tablet and crespo chips dropdown
Fixes bug:5520790 polish chip suggestions dropdown
Change-Id: I7da7e913aa243e95671b6df4c3488bf1bf0e09ef
hips/res/layout/chips_recipient_dropdown_item.xml
hips/res/values-sw600dp/styles.xml
hips/res/values/styles.xml
|
| b2427156276ed6226e0cc170e27fa561c19be60b |
01-Nov-2011 |
Mindy Pereira <mindyp@google.com> |
am 01821f44: Merge "Protect against negative offsets when calling replace." into ics-mr1
* commit '01821f44b0d2a518cc5f5635bb0456d04064804a':
Protect against negative offsets when calling replace.
|
| 01821f44b0d2a518cc5f5635bb0456d04064804a |
01-Nov-2011 |
Mindy Pereira <mindyp@google.com> |
Merge "Protect against negative offsets when calling replace." into ics-mr1
|
| 920c95167574395b1ff9ecc16e41e13853269bbc |
01-Nov-2011 |
Mindy Pereira <mindyp@google.com> |
Protect against negative offsets when calling replace.
Only seems to happen via the monkey.
Fixes bug:5541885 java.lang.ArrayIndexOutOfBoundsException: length=122; index=-5
Change-Id: Iba684c53982f5363990947d2b5b9d7544c952d85
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 48031807c6a79e2d037fdb8f5ad8e37f27ab6c70 |
31-Oct-2011 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-mr1-release
Change-Id: Ieccceb502853b657d18bc1331f0bdc75c9db439e
|
| 11aa515808762c6c62e1364156b68d12ac342ff4 |
28-Oct-2011 |
Ed Heyl <ed@google.com> |
keep previous history after reset to mr1 plus aah changes (ics-aah-wip)
|
| 7d5b3122249097568d909339e1347f0db7854b5c |
27-Oct-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| 06ec8388e065ac6ec5d59b7c36e2098161148b72 |
27-Oct-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
| a3c666da34736c3c449649281b6f8541d1d2dbd6 |
26-Oct-2011 |
Ed Heyl <ed@google.com> |
undo reset to ics-mr1 until we have a better method
|
| 3b2e834ff32220823996029ad47a8aa803fa6094 |
26-Oct-2011 |
Ed Heyl <ed@google.com> |
reset to ics-mr1, but keep history
|
| 178d14af86be845acf73d4af13aa1200c2e34377 |
26-Oct-2011 |
Mindy Pereira <mindyp@google.com> |
Use system default list item backgrounds for the chips dropdown list.
Fixes b/5517138 chips: background selection color for chips dropdown is orange, not blue
Change-Id: Ie0fce4cafe73186659eb822882cc64675806d2a3
hips/res/drawable/list_item_background.xml
hips/res/layout/chips_recipient_dropdown_item.xml
hips/res/values-sw600dp/styles.xml
hips/res/values/attrs.xml
hips/res/values/colors.xml
|
| 9a913e9534752917cb9d2a49f644d753c4106ec2 |
23-Oct-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| 7fcd680e4686241e0f5e131e949a8d6071f87028 |
21-Oct-2011 |
Mindy Pereira <mindyp@google.com> |
am 1ff68c4e: Merge "Protect against monkey crash."
* commit '1ff68c4e0f4e9cf4327386b01669248c1cdf0c75':
Protect against monkey crash.
|
| 1ff68c4e0f4e9cf4327386b01669248c1cdf0c75 |
21-Oct-2011 |
Mindy Pereira <mindyp@google.com> |
Merge "Protect against monkey crash."
|
| 6fe9af5b1cc380243f0fad9354ab7bd41ac2983b |
21-Oct-2011 |
Mindy Pereira <mindyp@google.com> |
Protect against monkey crash.
Fixes bug:5486900 java.lang.ArrayIndexOutOfBoundsException: length=122; index=-3
Change-Id: I2daa941670276d5d65d8d7f14a4d07789aae3a87
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 5268e944a2af4821918996ced27ffb6a781a1b29 |
19-Oct-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| 6f36d78150c9107d8c915bf517cebbe25a7a74f0 |
19-Oct-2011 |
Eric Fischer <enf@google.com> |
am efce7a43: Merge "Import revised translations."
* commit 'efce7a43668be367b0846fe894bd1bf69711b5ec':
Import revised translations.
|
| efce7a43668be367b0846fe894bd1bf69711b5ec |
19-Oct-2011 |
Eric Fischer <enf@google.com> |
Merge "Import revised translations."
|
| d70048310bedd675245a8cf55908a5089084b28f |
19-Oct-2011 |
Eric Fischer <enf@google.com> |
Import revised translations.
Change-Id: I85294e37b07eb6f024f86a0ddd9149085a01d9d6
arousel/test/res/values-hi/strings.xml
hips/res/values-hi/strings.xml
hips/res/values-ru/strings.xml
|
| 5074fc4c9c8c99be66effda4adaa8b7325853798 |
18-Oct-2011 |
Eric Fischer <enf@google.com> |
am 90295eed: (-s ours) am 8a04f951: (-s ours) Import revised translations. DO NOT MERGE
* commit '90295eed0672d4b1d778cabf8c6a34ce66cc4907':
Import revised translations. DO NOT MERGE
|
| 90295eed0672d4b1d778cabf8c6a34ce66cc4907 |
18-Oct-2011 |
Eric Fischer <enf@google.com> |
am 8a04f951: (-s ours) Import revised translations. DO NOT MERGE
* commit '8a04f95151972fa2467c5f028b2dfcfe3c33bd62':
Import revised translations. DO NOT MERGE
|
| 8a04f95151972fa2467c5f028b2dfcfe3c33bd62 |
18-Oct-2011 |
Eric Fischer <enf@google.com> |
Import revised translations. DO NOT MERGE
Change-Id: I7c3ac54f4118705190c028e747c5c4a4942ccf58
arousel/test/res/values-hi/strings.xml
hips/res/values-hi/strings.xml
hips/res/values-ru/strings.xml
|
| 3feebaec793be323069574758e9261d8c005faea |
18-Oct-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| 7183e9b28ba841568b516bb64a0bb36057ded93d |
17-Oct-2011 |
Mindy Pereira <mindyp@google.com> |
am 253c9e34: Merge "Make sure we shrink available width by the width of the space character."
* commit '253c9e347c5ca122ec6a668c3ac7a3d4dcdf1cf1':
Make sure we shrink available width by the width of the space character.
|
| 253c9e347c5ca122ec6a668c3ac7a3d4dcdf1cf1 |
17-Oct-2011 |
Mindy Pereira <mindyp@google.com> |
Merge "Make sure we shrink available width by the width of the space character."
|
| 66bcf1940a439cb10e26e0cdd7354a36825bf5d0 |
16-Oct-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| 872ca905a8d96117421264fa9431f0940bf35637 |
15-Oct-2011 |
Jeff Brown <jeffbrown@google.com> |
am 723f8c7d: Merge "Remove ArrayListCursor."
* commit '723f8c7df781400f25fffc325b3621f0615d9c67':
Remove ArrayListCursor.
|
| 723f8c7df781400f25fffc325b3621f0615d9c67 |
15-Oct-2011 |
Jeff Brown <jeffbrown@google.com> |
Merge "Remove ArrayListCursor."
|
| e73c4ce189c70e7f9f4d44b26fce458e3385988a |
15-Oct-2011 |
Mindy Pereira <mindyp@google.com> |
Make sure we shrink available width by the width of the space character.
Change-Id: I2dccaf1252f36bb73769d57b7ba19e72ef4e5f8a
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| a9b10fc1936cbea55b017bc52dcd61402ded0d04 |
15-Oct-2011 |
Minh Pham <phamm@google.com> |
am 3e963198: Experiment drag and drop for contact chip
* commit '3e9631982511d9692e4bc0dbd724240fae91cf1f':
Experiment drag and drop for contact chip
|
| 3e9631982511d9692e4bc0dbd724240fae91cf1f |
12-Oct-2011 |
Minh Pham <phamm@google.com> |
Experiment drag and drop for contact chip
- Make RecipientEditTextView start drag mode on long press
- Make RecipientEditTextView handle drag event
- Enable via a public setter
Change-Id: Iccfb099078d7be12bdf473a3ff607ac5267f4256
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 271d9a4fbcceff900f9f3411dfe0d89bbb9c6721 |
14-Oct-2011 |
Mindy Pereira <mindyp@google.com> |
am 1e12ddb8: Make sure we perform reverse lookup on pasted recips
* commit '1e12ddb8232423b09b8df6c59f2e65189a0eea0a':
Make sure we perform reverse lookup on pasted recips
|
| 1e12ddb8232423b09b8df6c59f2e65189a0eea0a |
14-Oct-2011 |
Mindy Pereira <mindyp@google.com> |
Make sure we perform reverse lookup on pasted recips
Change-Id: Iff0d8670962f279e4fa3158a1acc3395f9e9ddc9
hips/src/com/android/ex/chips/RecipientAlternatesAdapter.java
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 1a9270081b0852a72fbe21775611a1493a336d47 |
14-Oct-2011 |
Mindy Pereira <mindyp@google.com> |
am 81bd60c6: Merge "General cleanup of the chips view."
* commit '81bd60c6176293effd05703285ad4b486d7af131':
General cleanup of the chips view.
|
| 81bd60c6176293effd05703285ad4b486d7af131 |
14-Oct-2011 |
Mindy Pereira <mindyp@google.com> |
Merge "General cleanup of the chips view."
|
| 00be4ce28569ae7d1871a2f95453b0e6a6a47852 |
14-Oct-2011 |
Mindy Pereira <mindyp@google.com> |
General cleanup of the chips view.
1) remove extra code
2) make sure we use convenience methods where possible
3) always make sure that we use sorted recipient chips when looking
for the position of a chip
4) test the convenience methods
5) rempove unused code
6) make methods package private that don't have to be public
Change-Id: I586eac795a548456ec29bd384abd2e7611a24a03
hips/res/values/styles.xml
hips/src/com/android/ex/chips/RecipientEditTextView.java
hips/tests/src/com/android/ex/chips/ChipsTest.java
|
| b5d5ad5eb54f5da989c30d77612995097711f802 |
14-Oct-2011 |
Mindy Pereira <mindyp@google.com> |
am f593cd2e: am 786f2b8a: Use flagNoFullScreen instead of flagNoExtractUi
* commit 'f593cd2e7cfa334ee586e1e26d0013d924036b33':
Use flagNoFullScreen instead of flagNoExtractUi
|
| f593cd2e7cfa334ee586e1e26d0013d924036b33 |
14-Oct-2011 |
Mindy Pereira <mindyp@google.com> |
am 786f2b8a: Use flagNoFullScreen instead of flagNoExtractUi
* commit '786f2b8a35ee2dc8207d9669fb6b66dd52f266a0':
Use flagNoFullScreen instead of flagNoExtractUi
|
| 786f2b8a35ee2dc8207d9669fb6b66dd52f266a0 |
14-Oct-2011 |
Mindy Pereira <mindyp@google.com> |
Use flagNoFullScreen instead of flagNoExtractUi
This is the suggestion from the ime team to make apps using Chips
to behave better with the changes they have made to the ime.
Fixes bug:5410786 When in landscape w/ Smart Keyboard, can't scroll to top
Change-Id: Ib88011778e580358cd22ccca3d2575ebe0a0aeb0
hips/res/values/styles.xml
|
| 55ea0e0d58031eb0b1a4085a725a22650de6bbea |
14-Oct-2011 |
Daisuke Miyakawa <dmiyakawa@google.com> |
am c7d1dd69: (-s ours) am 420fa444: (-s ours) DO NOT MERGE. Use minHeight to allow large fonts.
* commit 'c7d1dd69413736758374c3d4146551009e6a987f':
DO NOT MERGE. Use minHeight to allow large fonts.
|
| c7d1dd69413736758374c3d4146551009e6a987f |
14-Oct-2011 |
Daisuke Miyakawa <dmiyakawa@google.com> |
am 420fa444: (-s ours) DO NOT MERGE. Use minHeight to allow large fonts.
* commit '420fa4442a31b5541844a0f46604f359e07b61ed':
DO NOT MERGE. Use minHeight to allow large fonts.
|
| 420fa4442a31b5541844a0f46604f359e07b61ed |
14-Oct-2011 |
Daisuke Miyakawa <dmiyakawa@google.com> |
DO NOT MERGE. Use minHeight to allow large fonts.
Backporting I2866717e9767e431ec3aab26ea42077b9e18a031
Bug: 5458020
Change-Id: Iaf4ddf59819932f641c1f9949c975f107f961a4f
hips/res/layout/chips_recipient_dropdown_item.xml
|
| 491a50e12b571fa4f3e85a5e4db15eebb051ff30 |
14-Oct-2011 |
Daisuke Miyakawa <dmiyakawa@google.com> |
am 426bca36: Merge "Use minHeight to allow large fonts."
* commit '426bca365c3bea7b1d5f7d72437fc28e978bdca0':
Use minHeight to allow large fonts.
|
| 426bca365c3bea7b1d5f7d72437fc28e978bdca0 |
14-Oct-2011 |
Daisuke Miyakawa <dmiyakawa@google.com> |
Merge "Use minHeight to allow large fonts."
|
| a1763c5e354466c59cff252caa7df0d06f874e78 |
14-Oct-2011 |
Daisuke Miyakawa <dmiyakawa@google.com> |
Use minHeight to allow large fonts.
Bug: 5458020
Change-Id: I2866717e9767e431ec3aab26ea42077b9e18a031
hips/res/layout/chips_recipient_dropdown_item.xml
|
| 47109b5e2af2126eba8738816f683a70f5cad772 |
14-Oct-2011 |
Mindy Pereira <mindyp@google.com> |
am 49ce9866: Update pasting to handle more cases.
* commit '49ce9866ae314b3513e17008f107ceded23f9cf0':
Update pasting to handle more cases.
|
| 49ce9866ae314b3513e17008f107ceded23f9cf0 |
12-Oct-2011 |
Mindy Pereira <mindyp@google.com> |
Update pasting to handle more cases.
Fixes bug:5026774 pasting in email addresses changes
Change-Id: Id16e7470eb10a998fdb5efde06cb4449bb9d49e7
hips/src/com/android/ex/chips/RecipientEditTextView.java
hips/tests/src/com/android/ex/chips/ChipsTest.java
|
| b0730385b0822b508e386741eb5638760a97e9fd |
13-Oct-2011 |
Jeff Brown <jeffbrown@google.com> |
Remove ArrayListCursor.
Change-Id: Iadf4bfbc86efdb04ba2917d9def65061e3cc3a23
ommon/java/com/android/common/ArrayListCursor.java
|
| 31e12c3e685143f483292a2440dfd7aafc9cdcb9 |
12-Oct-2011 |
Mindy Pereira <mindyp@google.com> |
am 04d53a95: (-s ours) am ed358600: (-s ours) DO NOT MERGE. Use settext to instead of clearing.
* commit '04d53a95a237538cb7c9a2b4c5091d90e5c09fb7':
DO NOT MERGE. Use settext to instead of clearing.
|
| 07f810c0f63d5dd14104f237f9defd8ede8c9dac |
12-Oct-2011 |
Mindy Pereira <mindyp@google.com> |
am 2e157c2b: Use settext to instead of clearing.
* commit '2e157c2b6e02a8648a87aa33163ecb89a641c2b0':
Use settext to instead of clearing.
|
| 0dbffab273ff1c015ebb291a8592331e32e791df |
12-Oct-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| 04d53a95a237538cb7c9a2b4c5091d90e5c09fb7 |
12-Oct-2011 |
Mindy Pereira <mindyp@google.com> |
am ed358600: (-s ours) DO NOT MERGE. Use settext to instead of clearing.
* commit 'ed35860055b334d313d7b454892610891f5b7fce':
DO NOT MERGE. Use settext to instead of clearing.
|
| ed35860055b334d313d7b454892610891f5b7fce |
12-Oct-2011 |
Mindy Pereira <mindyp@google.com> |
DO NOT MERGE. Use settext to instead of clearing.
cherrypick from master
Fixes bug:5444923 Gmail crash when replying
Change-Id: Ie43f10959a72ea471122811761ea4446e93aa5a4
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 2e157c2b6e02a8648a87aa33163ecb89a641c2b0 |
12-Oct-2011 |
Mindy Pereira <mindyp@google.com> |
Use settext to instead of clearing.
will cherrypick this to mr0.
Fixes bug:5444923 Gmail crash when replying
Change-Id: Ie43f10959a72ea471122811761ea4446e93aa5a4
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| b074c4aacd00c6ee06c0cf03609d556dd8f6a738 |
11-Oct-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| 22464d4d6f778cdf61262c87e20395f8d2c96049 |
10-Oct-2011 |
Mindy Pereira <mindyp@google.com> |
am 7de942db: Avoid unnecessary clearing of text.
* commit '7de942db0527a19e8291fed5c399128177660c1e':
Avoid unnecessary clearing of text.
|
| 7de942db0527a19e8291fed5c399128177660c1e |
05-Oct-2011 |
Mindy Pereira <mindyp@google.com> |
Avoid unnecessary clearing of text.
Clearing the text sent an extra text changed event that enabled auto
saving when it wasn't necessary. Clearing the spans and replacing the text
works just as well.
Second part of fix for bug:5420705 Gmail saves empty draft when triggered from Contacts
Change-Id: Icdca5be1ca0cdfd8cbf926baacec54e757480d89
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| e8785cd567e9931ae20e36b2377e27dd854bb527 |
06-Oct-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| 76ecb66ade36a10f0f7e74beac52c8fe10977d9b |
05-Oct-2011 |
Mindy Pereira <mindyp@google.com> |
am a1ecf3cc: Fix case where we may have an empty string.
* commit 'a1ecf3cc31e72b56d51690ae6524e8a26e9dd358':
Fix case where we may have an empty string.
|
| a1ecf3cc31e72b56d51690ae6524e8a26e9dd358 |
05-Oct-2011 |
Mindy Pereira <mindyp@google.com> |
Fix case where we may have an empty string.
Fixes b/5416986 RTE found in Android Problem Reports
Change-Id: I498bdff301ea3b3aa61e90e4d5c370abde4d1e43
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 5702ce762ad0287ec634ffffa2d8599a493ae492 |
04-Oct-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| c974f3eafe482591dfe9eaa76129eaeab43749d2 |
03-Oct-2011 |
Mindy Pereira <mindyp@google.com> |
am 8893cb7c: Merge "Protect against negative offsets for a chip."
* commit '8893cb7ccc0d3de108b6b42effe9ece565f0cc0c':
Protect against negative offsets for a chip.
|
| 8893cb7ccc0d3de108b6b42effe9ece565f0cc0c |
03-Oct-2011 |
Mindy Pereira <mindyp@google.com> |
Merge "Protect against negative offsets for a chip."
|
| cc75630ef7e216cb54b3711dd8f9a758633b792e |
03-Oct-2011 |
Mindy Pereira <mindyp@google.com> |
am 7741b6a6: Merge "Close selected chip on rotation."
* commit '7741b6a691077734661bf01101f7d747b863a80f':
Close selected chip on rotation.
|
| 7741b6a691077734661bf01101f7d747b863a80f |
03-Oct-2011 |
Mindy Pereira <mindyp@google.com> |
Merge "Close selected chip on rotation."
|
| 71fa24bfb96744cf28d368d58172c14638e14693 |
03-Oct-2011 |
Mindy Pereira <mindyp@google.com> |
Protect against negative offsets for a chip.
Fixes b/5397113 java.lang.ArrayIndexOutOfBoundsException: length=506; index=-2
Change-Id: Ib0e4cd18016701f45a5abcb9cf95431f478f07d8
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 5b86b061cebd1f41ad2387052200a835621b71ea |
03-Oct-2011 |
Mindy Pereira <mindyp@google.com> |
am b3e42aaf: Revert "Make the space part of the replacement image span."
* commit 'b3e42aaf97e476719cede047394718fd001fd79b':
Revert "Make the space part of the replacement image span."
|
| 7c61ef07ed148922a0b71c4e8ebb741cff2c5ae7 |
03-Oct-2011 |
Mindy Pereira <mindyp@google.com> |
Close selected chip on rotation.
Fixes bug:5387848 Email selection box is wrongly pointed after changing orientation
Change-Id: I16b781455de842e10197f15d13ab1be1d334264e
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| b3e42aaf97e476719cede047394718fd001fd79b |
03-Oct-2011 |
Mindy Pereira <mindyp@google.com> |
Revert "Make the space part of the replacement image span."
This reverts commit a1d52e9203ea3cdfc0d1c69a8a4f99445fdd5ca1
Also reverts later change:
https://android-git.corp.google.com/g/#/c/138160/3
That was made to remove code that took into account having a space not
covered by the span character.
Fixes tests cases to respect the space character again.
Change-Id: I96d52a5df4d01e757f72949cbcf3b1f582679a46
hips/src/com/android/ex/chips/RecipientChip.java
hips/src/com/android/ex/chips/RecipientEditTextView.java
hips/tests/src/com/android/ex/chips/ChipsTest.java
|
| 1e2c8d75e0d94f12d038615a642c056521a99cd3 |
28-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| 8fad0d0a0b0d60bbc76f5296e068c5c76cf21da8 |
27-Sep-2011 |
Mindy Pereira <mindyp@google.com> |
am 878b7cea: Add comments to chips. Test replace first, middle, last chips.
* commit '878b7cea14b1f8583611a7df58a4406b3eca34b6':
Add comments to chips. Test replace first, middle, last chips.
|
| 878b7cea14b1f8583611a7df58a4406b3eca34b6 |
27-Sep-2011 |
Mindy Pereira <mindyp@google.com> |
Add comments to chips. Test replace first, middle, last chips.
Change-Id: Ib4c7b32879bc6a2f81ebd970645ae956ef177e10
hips/tests/src/com/android/ex/chips/ChipsTest.java
|
| 1af40c0fb5c32123f1dc062aa198592e53ddbdee |
27-Sep-2011 |
Mindy Pereira <mindyp@google.com> |
am ae7e4110: Add more tests.
* commit 'ae7e41106f289f2668c54fff6c457c6fc91ab4a9':
Add more tests.
|
| ae7e41106f289f2668c54fff6c457c6fc91ab4a9 |
27-Sep-2011 |
Mindy Pereira <mindyp@google.com> |
Add more tests.
Tests verifying where a chip is position, removing a chip,
and creating a chip.
Change-Id: I2e9c6719a6efc365ab73c4d3c32bb29209b73e48
hips/src/com/android/ex/chips/RecipientEditTextView.java
hips/tests/src/com/android/ex/chips/ChipsTest.java
|
| c5024c05af60daf44f573a4d66802556ae796f23 |
27-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| 6368f40c9d8616b9ba9f27a8add9bc3a5c98356e |
26-Sep-2011 |
Mindy Pereira <mindyp@google.com> |
am 53958d6d: Remeasure chips created from saved instance state after we have the field width.
* commit '53958d6d0ba2a0765fd3d272295b81c6d89a68d8':
Remeasure chips created from saved instance state after we have the field width.
|
| 53958d6d0ba2a0765fd3d272295b81c6d89a68d8 |
26-Sep-2011 |
Mindy Pereira <mindyp@google.com> |
Remeasure chips created from saved instance state after we have the field width.
Fixes bug:5367531 Recipient with very long name duplicated while composing a mail on changing orientation
Change-Id: Id14d74d028aa203dfb061b32438eccc5abb949a0
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 3248ebbe31c6ae5dc9fa627b07924e193cc2de19 |
25-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| 0d0315871d8ba381e4d47495ca6bffcef46ccf36 |
23-Sep-2011 |
Mindy Pereira <mindyp@google.com> |
am a1d52e92: Make the space part of the replacement image span.
* commit 'a1d52e9203ea3cdfc0d1c69a8a4f99445fdd5ca1':
Make the space part of the replacement image span.
|
| a1d52e9203ea3cdfc0d1c69a8a4f99445fdd5ca1 |
23-Sep-2011 |
Mindy Pereira <mindyp@google.com> |
Make the space part of the replacement image span.
This eliminates the need for manually adding extra spaces at the end.
This also fixes bug:5323325 Chips sometimes have no spacing between them on deleting
since now the space is ALWAYS deleted when the chip is deleted.
Change-Id: I8923940a070bcc1ce6894af3efa1449e98aa4830
hips/res/values/styles.xml
hips/src/com/android/ex/chips/RecipientChip.java
hips/src/com/android/ex/chips/RecipientEditTextView.java
hips/tests/src/com/android/ex/chips/ChipsTest.java
|
| 5d51916af7c60d05a2e70d0e32b72a9c85db1338 |
22-Sep-2011 |
Mindy Pereira <mindyp@google.com> |
am 8a518e93: Fix reported crash.
* commit '8a518e93aef58d5ced2d0223a5fd89b996930e26':
Fix reported crash.
|
| 8a518e93aef58d5ced2d0223a5fd89b996930e26 |
22-Sep-2011 |
Mindy Pereira <mindyp@google.com> |
Fix reported crash.
Make sure we dont look for a char when there is nothing.
Change-Id: I70536ac57541ad9b7c0ae824c4b61dc0a57febac
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 1de4b16bdaa6affbda40fc48bf898946188c117b |
22-Sep-2011 |
The Android Open Source Project <initial-contribution@android.com> |
am 24a74272: Reconcile with ics-factoryrom-release
* commit '24a7427207a2104a976c1e6987cfd3b11f88e2cc':
|
| 24a7427207a2104a976c1e6987cfd3b11f88e2cc |
22-Sep-2011 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-factoryrom-release
Change-Id: I58847c8ad208492a1c5408f564594fac9c459762
|
| 972284e0cb20cc925cbaea216c75ab4e719827d0 |
22-Sep-2011 |
Mindy Pereira <mindyp@google.com> |
am a3806ce9: Protect against focus lost before drawing/uesrs already tokenized.
* commit 'a3806ce9e97ef635dc6d4495f9664b690de74960':
Protect against focus lost before drawing/uesrs already tokenized.
|
| a3806ce9e97ef635dc6d4495f9664b690de74960 |
22-Sep-2011 |
Mindy Pereira <mindyp@google.com> |
Protect against focus lost before drawing/uesrs already tokenized.
Fixes bug:5339625 odd behavior on orientation change in the "to field"
Also, added more test cases around adding/ removing more chip.
Change-Id: I1b24526b5be82835b5ec7c0345b7d73a31169a8f
hips/src/com/android/ex/chips/RecipientEditTextView.java
hips/tests/src/com/android/ex/chips/ChipsTest.java
|
| bfbe17bd093e884f806e0bca5bf410f0f0b311f0 |
21-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| 59cf39cf1a51ce63dc42b067fb84c5e31cc2531b |
21-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-factoryrom-release history after reset to ics-factoryrom
|
| 1da16e0b2903a536f59b298e93af7f55bc6414a2 |
21-Sep-2011 |
The Android Open Source Project <initial-contribution@android.com> |
am 4761cd71: Reconcile with ics-factoryrom-release
* commit '4761cd719d031dc486405109bfe53de1f6dc1b69':
|
| 4761cd719d031dc486405109bfe53de1f6dc1b69 |
21-Sep-2011 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-factoryrom-release
Change-Id: I4e21a5c61eac892cb71a4b7812572b5c24938138
|
| a33616d9ba2d9b4e8eb1882c831762abd9e38102 |
21-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-factoryrom-release history after reset to ics-factoryrom
|
| b1f49c5c45eccef035a3a9db027606c6deffcec9 |
21-Sep-2011 |
Mindy Pereira <mindyp@google.com> |
am 4cc1f477: Merge "More tests for sanitizing text between chips."
* commit '4cc1f47790f97c873d8f2f7f9688563315036f3c':
More tests for sanitizing text between chips.
|
| 93e6ff1adab3c2119d6a518f19228598e454e000 |
21-Sep-2011 |
Daisuke Miyakawa <dmiyakawa@google.com> |
am 3bab54de: Merge "Remove the code remiving non-existing divider"
* commit '3bab54de8ba9a3d99c207a039b2d2102ef6f4e70':
Remove the code remiving non-existing divider
|
| e39e38adfe2a4018fc132d656fca39ff035b9c05 |
21-Sep-2011 |
Mindy Pereira <mindyp@google.com> |
am 4031c89f: Add test cases for creating display tex and sanitzing spans.
* commit '4031c89f46edea42c64e183e46d49484f1f203c0':
Add test cases for creating display tex and sanitzing spans.
|
| 4cc1f47790f97c873d8f2f7f9688563315036f3c |
21-Sep-2011 |
Mindy Pereira <mindyp@google.com> |
Merge "More tests for sanitizing text between chips."
|
| a63e3fa13ddf1370125b7b005775c538ec22b83a |
21-Sep-2011 |
Mindy Pereira <mindyp@google.com> |
More tests for sanitizing text between chips.
This specifically tests sanitizing content that is before
a chip when there is only 1 chip around.
Also, makes sure we don't look for a chip that isn't
attached (startLooking or end < 0)
Change-Id: I2591f29490a53c23527bbee487f1446b18c3f161
hips/src/com/android/ex/chips/RecipientEditTextView.java
hips/tests/src/com/android/ex/chips/ChipsTest.java
|
| 3bab54de8ba9a3d99c207a039b2d2102ef6f4e70 |
21-Sep-2011 |
Daisuke Miyakawa <dmiyakawa@google.com> |
Merge "Remove the code remiving non-existing divider"
|
| 4031c89f46edea42c64e183e46d49484f1f203c0 |
20-Sep-2011 |
Mindy Pereira <mindyp@google.com> |
Add test cases for creating display tex and sanitzing spans.
Also, fixed a case we didn't catch where if the span start
was -1, we would crash.
Change-Id: Ia7d70dee117632ef2064c1f592fdc09694014846
hips/src/com/android/ex/chips/RecipientEditTextView.java
hips/tests/Android.mk
hips/tests/src/com/android/ex/chips/ChipsTest.java
|
| 59148d37f6602f04729b5c737c196ddecf764992 |
20-Sep-2011 |
Daisuke Miyakawa <dmiyakawa@google.com> |
Remove the code remiving non-existing divider
Previously we had a horizontal divider to divide each entry, while
we don't have them anymore. The code removing the last horizontal
divider now removes the last legitimate element in the list.
Bug: 5343615
Change-Id: Ia30e05f8830323a6e4d62b54e7121b439bb57beb
hips/src/com/android/ex/chips/BaseRecipientAdapter.java
|
| 0ec3ebeb54c960fcff0cc153ca6b369c2bb03a11 |
20-Sep-2011 |
Mindy Pereira <mindyp@google.com> |
am c7afc984: Fix crash in calendar.
* commit 'c7afc9841ee6dd3bc5e19ee7269fecd466a8c6e9':
Fix crash in calendar.
|
| 214c9286c1710594996d9c78c355e21c4536044c |
20-Sep-2011 |
Mindy Pereira <mindyp@google.com> |
am c10739cc: Fix monkey crash related to empty recips array/ bad tokenization.
* commit 'c10739cc694a0248b6187de2d7b9e8d2298bf0d3':
Fix monkey crash related to empty recips array/ bad tokenization.
|
| ade35b190b6319a9004e28aa8d9b1f9948d719bb |
20-Sep-2011 |
The Android Open Source Project <initial-contribution@android.com> |
am 020460ff: Reconcile with ics-factoryrom-release
* commit '020460ff2d3d055bd4e2f3794480e8adb63b8ff6':
|
| c7afc9841ee6dd3bc5e19ee7269fecd466a8c6e9 |
20-Sep-2011 |
Mindy Pereira <mindyp@google.com> |
Fix crash in calendar.
Protect against walking off the end.
Fixes bug:5347150 Calendar crash on selecting guest suggestion after changing device orientation (java.lang.IndexOutOfBoundsException: charAt: 52 >= length 52) in IRK82
Change-Id: I6216a770175adac34416dfabda202ac9846c95ac
hips/src/com/android/ex/chips/RecipientEditTextView.java
hips/tests/src/com/android/ex/chips/ChipsTest.java
|
| c10739cc694a0248b6187de2d7b9e8d2298bf0d3 |
20-Sep-2011 |
Mindy Pereira <mindyp@google.com> |
Fix monkey crash related to empty recips array/ bad tokenization.
Fixes bug:5343254 java.lang.ArrayIndexOutOfBoundsException: length=0; index=-1 at com.android.ex.chips.RecipientEditTextView.removeMoreChip(RecipientEditTextView.java:1408)
Fixes bug:5345831 ArrayIndexOutOfBoundsException in RecipientEditTextView.createDisplayText
Change-Id: Ie487c23dc54449d53f68d73c33e18cb946ec4284
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 020460ff2d3d055bd4e2f3794480e8adb63b8ff6 |
20-Sep-2011 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-factoryrom-release
Change-Id: Ia39c1a9a4a689318e35a565ed08d6fa66cfe40e3
|
| e00d9b076ad4f0b7f677245c386beefeaf4866fc |
20-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| ebfac8031ec91e51bee66b7397786cdc44dbedd4 |
20-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-factoryrom-release history after reset to ics-factoryrom
|
| 46e332672697848e94f9c44dd20f96425597ff53 |
20-Sep-2011 |
Daisuke Miyakawa <dmiyakawa@google.com> |
am e6cf5b6e: Merge "Disable logging."
* commit 'e6cf5b6e3ad9fb34284471364b0a0dfc104f2899':
Disable logging.
|
| e6cf5b6e3ad9fb34284471364b0a0dfc104f2899 |
20-Sep-2011 |
Daisuke Miyakawa <dmiyakawa@google.com> |
Merge "Disable logging."
|
| f3889fc9ea2db363a9a2bfc73a933ead5be5c110 |
20-Sep-2011 |
Daisuke Miyakawa <dmiyakawa@google.com> |
Disable logging.
Change-Id: I5c5c2bc169a6f9d9c77fd57d8b91dd3282432141
hips/src/com/android/ex/chips/BaseRecipientAdapter.java
|
| 56d4c78ce31d889714c23b5d9bddbd3bcb582756 |
20-Sep-2011 |
Mindy Pereira <mindyp@google.com> |
am f6b6b0a2: Sanitize content after committing a new chip.
* commit 'f6b6b0a26cdebf436dbee3eb4a7118081db7b4cc':
Sanitize content after committing a new chip.
|
| f6b6b0a26cdebf436dbee3eb4a7118081db7b4cc |
20-Sep-2011 |
Mindy Pereira <mindyp@google.com> |
Sanitize content after committing a new chip.
Fixes bug:5332719 check special characters in the chips implementation
- User goes to To field
- types , or ;
- adds another chip
Remove , or ; in between
Similarly
- User adds a chip using the return key
- Explicitly adds a , or ;
- Adds another chip
Remove the , or ; in between
-User add , or ; and moves to another field using return
- Keep the , or ;
When the user adds a new chip sanitize and remove them
Change-Id: I00b28f913230b7a60399e27a327a2152dd29e631
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 36d1c39c5a90bae34b55380fb9638000bb9bbd32 |
20-Sep-2011 |
Mindy Pereira <mindyp@google.com> |
am a590df86: Catch a couple of interesting/ odd cases for creating display text.
* commit 'a590df861d7a42cd2889ee96d0b9e51b47d28755':
Catch a couple of interesting/ odd cases for creating display text.
|
| a590df861d7a42cd2889ee96d0b9e51b47d28755 |
20-Sep-2011 |
Mindy Pereira <mindyp@google.com> |
Catch a couple of interesting/ odd cases for creating display text.
1) User Name <User Name <username@username.com>>
2) User Name,Jr <user@username.com>
Change-Id: Ic148def8d3dd630af3fc5765958d59a682e1accd
hips/src/com/android/ex/chips/RecipientEditTextView.java
hips/tests/src/com/android/ex/chips/ChipsTest.java
|
| dd2b6c818bc02d6fa59288fc99341883a5b36b4a |
19-Sep-2011 |
Mindy Pereira <mindyp@google.com> |
am 59827bad: Add test infrastructure for chips.
* commit '59827bad5b89a47bcb7074448b37547efca5abcb':
Add test infrastructure for chips.
|
| 59827bad5b89a47bcb7074448b37547efca5abcb |
19-Sep-2011 |
Mindy Pereira <mindyp@google.com> |
Add test infrastructure for chips.
This adds test infrastructure, manifest, and make files plus
an initial test file that doesn't do anything.
Change-Id: Icbca2584f315a2b001f580cb2648352e48eb284d
hips/tests/Android.mk
hips/tests/AndroidManifest.xml
hips/tests/src/com/android/ex/chips/ChipsTest.java
|
| 96f33670f726ee8a034f9b68b638b9f03892f3d4 |
19-Sep-2011 |
Mindy Pereira <mindyp@google.com> |
am 93dfbaf4: (-s ours) am 30541a2c: (-s ours) DO NOT MERGE. Make sure we get the correct more chip on orientation changes.
* commit '93dfbaf47c45f092d490374cc25b111eeb116bf9':
DO NOT MERGE. Make sure we get the correct more chip on orientation changes.
|
| 93dfbaf47c45f092d490374cc25b111eeb116bf9 |
19-Sep-2011 |
Mindy Pereira <mindyp@google.com> |
am 30541a2c: (-s ours) DO NOT MERGE. Make sure we get the correct more chip on orientation changes.
* commit '30541a2ce3e5ce342441f5ded9335b896fdc38e0':
DO NOT MERGE. Make sure we get the correct more chip on orientation changes.
|
| a3a1a97259869c4cbb4249b09a9934a75f5b6248 |
19-Sep-2011 |
Mindy Pereira <mindyp@google.com> |
am 262d3542: Merge "Make chips keep the user friendly information around."
* commit '262d3542612f3e40cd76c488f66b13ad1d617aaf':
Make chips keep the user friendly information around.
|
| 507f6e75691609482d4935f3f8ee64c7403217b8 |
19-Sep-2011 |
Mindy Pereira <mindyp@google.com> |
am 868c3ebe: Merge "Make sure we get the correct more chip on orientation changes."
* commit '868c3ebe9a34e1adc7897fb16d235e0787325ce8':
Make sure we get the correct more chip on orientation changes.
|
| 30541a2ce3e5ce342441f5ded9335b896fdc38e0 |
17-Sep-2011 |
Mindy Pereira <mindyp@google.com> |
DO NOT MERGE. Make sure we get the correct more chip on orientation changes.
Fixes bug:5334556 Turning device orientation to landscape is deleting recipient from compose mail.
Change-Id: I3cbcc785ab525a4f5069d7f2c06265997738cb06
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 262d3542612f3e40cd76c488f66b13ad1d617aaf |
19-Sep-2011 |
Mindy Pereira <mindyp@google.com> |
Merge "Make chips keep the user friendly information around."
|
| 868c3ebe9a34e1adc7897fb16d235e0787325ce8 |
19-Sep-2011 |
Mindy Pereira <mindyp@google.com> |
Merge "Make sure we get the correct more chip on orientation changes."
|
| 8659fc7fa4a245c962f8bc29b351acc56d02dfaa |
19-Sep-2011 |
Mindy Pereira <mindyp@google.com> |
Make chips keep the user friendly information around.
Fixes bug:5339963 chips not maintaining user friendly labels
Change-Id: Ie6e29887882081f56e40ff4845363d6538c814d4
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 22b680b63446e2b50f0f5e7d5307c7198387cebf |
17-Sep-2011 |
Mindy Pereira <mindyp@google.com> |
Make sure we get the correct more chip on orientation changes.
Fixes bug:5334556 Turning device orientation to landscape is deleting recipient from compose mail.
Change-Id: I5b96c7288ef84bc9585d8a553106bdc044c55b61
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| c11ee33b8552e602d0b20a356ba4c62cd1c023d9 |
19-Sep-2011 |
The Android Open Source Project <initial-contribution@android.com> |
am eb25ae09: Reconcile with ics-factoryrom-release
* commit 'eb25ae09b6c1790f3aea19f5fd82c492cac1e75c':
|
| eb25ae09b6c1790f3aea19f5fd82c492cac1e75c |
19-Sep-2011 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-factoryrom-release
Change-Id: I79e0d34fef232e236be836940f9f6b38676baab6
|
| 0e831e2dd02119c33b66ab4062193dcfc03b128e |
18-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| e175555b5242bc399589173d65df46e5bfa36530 |
18-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-factoryrom-release history after reset to ics-factoryrom
|
| df096985e72bacdffcc1b84dc88d5e838fbe274b |
16-Sep-2011 |
Mindy Pereira <mindyp@google.com> |
am a9c59692: Handle special characters correctly.
* commit 'a9c5969299cf942278391a569bb6fdd1c4a8bb6b':
Handle special characters correctly.
|
| a9c5969299cf942278391a569bb6fdd1c4a8bb6b |
16-Sep-2011 |
Mindy Pereira <mindyp@google.com> |
Handle special characters correctly.
Part of fix for bug:5332719 check special characters in the chips implementation
Change-Id: If525159ea03064805d01a4a793234a530a4155a7
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| c2bee65766693d1ccead2f721bbdb8827f193fda |
16-Sep-2011 |
The Android Open Source Project <initial-contribution@android.com> |
am c740811e: Reconcile with ics-factoryrom-release
* commit 'c740811eab332465d2638b9e34fa322ea43b834d':
DO NOT MERGE. Check for null chip text.
DO NOT MERGE. Use the correct check for min sdk support.
|
| c740811eab332465d2638b9e34fa322ea43b834d |
16-Sep-2011 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-factoryrom-release
Change-Id: I4e4b611b74c583da5c2cdbe367a9d79d86a88cb0
|
| 5036fe8c7a132f8d2af8dc026b49be8badd8c831 |
16-Sep-2011 |
Mindy Pereira <mindyp@google.com> |
am 3b646f13: Don\'t allow ppl to accidentally create empty chips
* commit '3b646f13eb127b26d45ead7f819b943b2b01ce91':
Don't allow ppl to accidentally create empty chips
|
| 3b646f13eb127b26d45ead7f819b943b2b01ce91 |
16-Sep-2011 |
Mindy Pereira <mindyp@google.com> |
Don't allow ppl to accidentally create empty chips
Fixes bug:5318460 com.google.android.gm: java.lang.IndexOutOfBoundsException: setSpan (33 ... 31) has end before start at android.text.SpannableStringInternal.checkRange(SpannableStringInternal.java:341)
As a user reproduced it
not sure if it fixes the monkey crash, but probably does
Change-Id: Ibed7e4f806f9f290c39d1c4834d8d67a8ccd179f
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 69713bd6321ee1f467adce9a52630d10002fcd5f |
15-Sep-2011 |
Mindy Pereira <mindyp@google.com> |
Check for null chip text before committing chip.
Fixes bug:5324605 java.lang.NullPointerException at android.text.SpannableStringBuilder.replace(SpannableStringBuilder.java:420)
Change-Id: Iabe38276c4a7f8e206745ad4944a783462e067f7
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 5a2dfb5a28dbf3823a3c37dcbdc6adfb31e220aa |
15-Sep-2011 |
Mindy Pereira <mindyp@google.com> |
Use the official sdk version for checking compatibility.
At some point we want to update the makefile as well.
Change-Id: I6a06a76c8c621157901a5aad8af8565da2af7dda
hips/src/com/android/ex/chips/ChipsUtil.java
|
| 3a9de1a4cbb9dfd6525b485c6833abcbfa06a330 |
16-Sep-2011 |
Mindy Pereira <mindyp@google.com> |
am 31a2c093: am 53152808: Move local_sdk to 14
* commit '31a2c093545fce61b1e5a2ce9b430fbed4096a81':
Move local_sdk to 14
|
| 31a2c093545fce61b1e5a2ce9b430fbed4096a81 |
16-Sep-2011 |
Mindy Pereira <mindyp@google.com> |
am 53152808: Move local_sdk to 14
* commit '53152808aa153dc5400997892ee6cedf27819051':
Move local_sdk to 14
|
| 53152808aa153dc5400997892ee6cedf27819051 |
16-Sep-2011 |
Mindy Pereira <mindyp@google.com> |
Move local_sdk to 14
Fixes bug:5331094 move chips, gmail to SDK 14
Change-Id: Ib113a571a8c8da93611b5d58f992e0b333a471ea
hips/Android.mk
|
| 36487f023572ca9b8d349935a571eaaeb9305740 |
16-Sep-2011 |
Mindy Pereira <mindyp@google.com> |
am 4b521901: (-s ours) am a74ea02a: (-s ours) Merge "DO NOT MERGE. Check for null chip text." into ics-factoryrom
* commit '4b521901c90152b6ab0748c3828a36346c9c460d':
DO NOT MERGE. Check for null chip text.
|
| 899ee89d4a8693edfd5d0f4077fbf37f66c4e5e1 |
16-Sep-2011 |
Mindy Pereira <mindyp@google.com> |
am 2e330d3e: (-s ours) am e44dfb5d: (-s ours) DO NOT MERGE. Use the correct check for min sdk support.
* commit '2e330d3e4b9e3f841539b0ebdf80b5f33b7b0580':
DO NOT MERGE. Use the correct check for min sdk support.
|
| 4b521901c90152b6ab0748c3828a36346c9c460d |
16-Sep-2011 |
Mindy Pereira <mindyp@google.com> |
am a74ea02a: (-s ours) Merge "DO NOT MERGE. Check for null chip text." into ics-factoryrom
* commit 'a74ea02a54a5fa7ff4c5fa98ebafc5d276e47f6f':
DO NOT MERGE. Check for null chip text.
|
| 2e330d3e4b9e3f841539b0ebdf80b5f33b7b0580 |
16-Sep-2011 |
Mindy Pereira <mindyp@google.com> |
am e44dfb5d: (-s ours) DO NOT MERGE. Use the correct check for min sdk support.
* commit 'e44dfb5d806e84ace7ac97684d8f683e8d9bd1b7':
DO NOT MERGE. Use the correct check for min sdk support.
|
| f886642627b77de32424621d44ae7f3a62a8260a |
15-Sep-2011 |
Mindy Pereira <mindyp@google.com> |
DO NOT MERGE. Check for null chip text.
Fixes bug:5324605 java.lang.NullPointerException at android.text.SpannableStringBuilder.replace(SpannableStringBuilder.java:420)
Change-Id: If84a447d1209c5802298f5e886b4580fd3112248
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 9e92a6de3c6b48a2c688f18985316ff0176608b1 |
15-Sep-2011 |
Mindy Pereira <mindyp@google.com> |
DO NOT MERGE. Use the correct check for min sdk support.
Fixes bug:5322179 ClassCastException while trying to add recipient email address
Change-Id: I293c0f453a8820c790d3c20841719543367f1696
hips/src/com/android/ex/chips/ChipsUtil.java
|
| a74ea02a54a5fa7ff4c5fa98ebafc5d276e47f6f |
15-Sep-2011 |
Mindy Pereira <mindyp@google.com> |
Merge "DO NOT MERGE. Check for null chip text." into ics-factoryrom
|
| d600a47786d6ea40672ba9bde04a54bc05a9e494 |
15-Sep-2011 |
Mindy Pereira <mindyp@google.com> |
am 5ac77e6d: Check for null chip text before committing chip.
* commit '5ac77e6db71c0bc45bcc40cc5cb721333dcb5857':
Check for null chip text before committing chip.
|
| 06a720605899c4a57e4426218c7a3383137d85f9 |
15-Sep-2011 |
Mindy Pereira <mindyp@google.com> |
DO NOT MERGE. Check for null chip text.
Fixes bug:5324605 java.lang.NullPointerException at android.text.SpannableStringBuilder.replace(SpannableStringBuilder.java:420)
Change-Id: If84a447d1209c5802298f5e886b4580fd3112248
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 5ac77e6db71c0bc45bcc40cc5cb721333dcb5857 |
15-Sep-2011 |
Mindy Pereira <mindyp@google.com> |
Check for null chip text before committing chip.
Fixes bug:5324605 java.lang.NullPointerException at android.text.SpannableStringBuilder.replace(SpannableStringBuilder.java:420)
Change-Id: Iabe38276c4a7f8e206745ad4944a783462e067f7
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| bd8e7668cba33e51e9f2087185670900c439742c |
15-Sep-2011 |
Jason Chen <jasonchen@google.com> |
am 5b6c680d: (-s ours) am 5d998dc9: (-s ours) am 6d51c9aa: Update HC LTE to match HC MR2 DO NOT MERGE
* commit '5b6c680d63e6b5614f9811d00a888cd597ba2c4a':
Add ability to set overscroll slot count
DO NOT MERGE: Add the new global-search field to android-common.
|
| 5b6c680d63e6b5614f9811d00a888cd597ba2c4a |
15-Sep-2011 |
Jason Chen <jasonchen@google.com> |
am 5d998dc9: (-s ours) am 6d51c9aa: Update HC LTE to match HC MR2 DO NOT MERGE
* commit '5d998dc93c94acb357f8fa0a0d4f867fb8afcd46':
Add ability to set overscroll slot count
DO NOT MERGE: Add the new global-search field to android-common.
|
| e44dfb5d806e84ace7ac97684d8f683e8d9bd1b7 |
15-Sep-2011 |
Mindy Pereira <mindyp@google.com> |
DO NOT MERGE. Use the correct check for min sdk support.
Fixes bug:5322179 ClassCastException while trying to add recipient email address
Change-Id: I293c0f453a8820c790d3c20841719543367f1696
hips/src/com/android/ex/chips/ChipsUtil.java
|
| f712add6803edb235372ef1481b11834794b4de8 |
15-Sep-2011 |
Mindy Pereira <mindyp@google.com> |
Merge "Use the official sdk version for checking compatibility."
|
| 18e3b50ab543900e8e2d5a272ca966f3034f549f |
15-Sep-2011 |
Mindy Pereira <mindyp@google.com> |
Use the official sdk version for checking compatibility.
At some point we want to update the makefile as well.
Change-Id: I6a06a76c8c621157901a5aad8af8565da2af7dda
hips/src/com/android/ex/chips/ChipsUtil.java
|
| 018edf61ea91c78255153d4c4fa2e601325b9602 |
15-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| fab0b56b50bed1c01dbf8f7125362334ecec75cc |
15-Sep-2011 |
Katherine Kuan <katherinekuan@google.com> |
Merge "Swap default contact asset in autocomplete drop down"
|
| dc412eb4ad3e66aacb1a9a1f0e6a5148c5857ef9 |
14-Sep-2011 |
Katherine Kuan <katherinekuan@google.com> |
Swap default contact asset in autocomplete drop down
Bug: 5074147
Change-Id: I49f581deef7201e157279aec6d61cfd2e0fe6e99
hips/res/drawable-hdpi/ic_contact_picture.png
hips/res/drawable-mdpi/ic_contact_picture.png
hips/res/drawable-xhdpi/ic_contact_picture.png
|
| 4b80d252210137df98bb393b290725f93877b00c |
15-Sep-2011 |
Daisuke Miyakawa <dmiyakawa@google.com> |
Use ICS version code
Bug: 5047678
Change-Id: I748525684b82f16d7a799b035ad2cfed22fa02d9
ommon/java/com/android/common/contacts/DataUsageStatUpdater.java
|
| 3270c5be1ab6e236b50fa2d085cd7a7c8c9a8b5d |
14-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| 5d998dc93c94acb357f8fa0a0d4f867fb8afcd46 |
14-Sep-2011 |
Jason Chen <jasonchen@google.com> |
am 6d51c9aa: Update HC LTE to match HC MR2 DO NOT MERGE
* commit '6d51c9aab5c0d594f924258345bec92a450e9485':
Add ability to set overscroll slot count
DO NOT MERGE: Add the new global-search field to android-common.
|
| 6d51c9aab5c0d594f924258345bec92a450e9485 |
14-Sep-2011 |
Jason Chen <jasonchen@google.com> |
Update HC LTE to match HC MR2 DO NOT MERGE
Change-Id: I30cbd7ddcabc0841a21b236fe0e19f11129e5440
|
| 5753143e03a6b8a61b2ffd6cbb04f1d54f406956 |
14-Sep-2011 |
Mindy Pereira <mindyp@google.com> |
Handle the case where a user is editing an invalid contact chip correctly.
We now treat an invalid contact chip (ie just text the user is editing
that was a chip) as being a selected chip. Make sure we handle the
edit cases for this correctly.
Fixes bug:5288176 Email address not distinguished in Email application
Change-Id: Ia9d3803f22d6d2f92cf280fc65b9d95b1a21c713
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 39f40bde5f9af410126c64d29c045fe8bf03c1bb |
13-Sep-2011 |
Mindy Pereira <mindyp@google.com> |
Protect against editing a chip that is no longer spanning text in the field.
Result of a moneky crash. No idea how a person could repro this, but the
protection step is easy.
Fixes bug:5278667 com.google.android.calendar: java.lang.ArrayIndexOutOfBoundsException: length=2; index=-1 at android.text.MeasuredText.setPara(MeasuredText.java:113)
Change-Id: I3bf35b94dfd474d5d6604799b848b5817f747a4c
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 9961510759324ae355a8b4a95fbc1100d96de7f6 |
13-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| f9b3dcb83c869528b7679a5b181f936aa8fbecdd |
12-Sep-2011 |
Mindy Pereira <mindyp@google.com> |
Make photo and delete icons fit within the chip background.
Fixes bug:5289589 Chip thumbnail image should not extend outside the chip
Change-Id: I8191c52a531b47e45073a9a08b879051ec10af37
hips/res/drawable-hdpi/chip_background_selected.9.png
hips/res/drawable-mdpi/chip_background_selected.9.png
hips/res/drawable-xhdpi/chip_background_selected.9.png
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 6b07123cc9d287211fab71276eb692d8339743e8 |
12-Sep-2011 |
Mindy Pereira <mindyp@google.com> |
Merge "Dont allow this to scroll when a chip gets selected."
|
| 10bd6d20127774dd84fc95f277aa9d46d3d709d6 |
11-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| 56a63f22b98146f4172e446c5d54ff3e1a0d9085 |
10-Sep-2011 |
Bryan Mawhinney <bryanmawhinney@google.com> |
Merge "Add ability to set overscroll slot count"
|
| e0d95425cbadd7aaff5f8fdbb30ac40cb22c0aa4 |
10-Sep-2011 |
Mindy Pereira <mindyp@google.com> |
Dont allow this to scroll when a chip gets selected.
The way we accomplish this is by setting the field to disabled
when a chip is selected so the IME does not pop up and change
the position of the field.
Fixes bug:5277127 No way to remove a recipient from a long list of recipients using chip UI
Change-Id: Id0783ddb159c98daeb1738d10a0660dd03819649
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 64ac8950aaf2355bb7e942e4aec4d580d71b45c0 |
09-Sep-2011 |
Bryan Mawhinney <bryanmawhinney@google.com> |
Add ability to set overscroll slot count
Change-Id: I10541172d99e1ede5b27bfcef106afadc0e540d4
arousel/java/com/android/ex/carousel/CarouselController.java
arousel/java/com/android/ex/carousel/CarouselRS.java
arousel/java/com/android/ex/carousel/CarouselView.java
arousel/java/com/android/ex/carousel/carousel.rs
|
| 64077e9710ac8e8df1b7c9828ea985cccb3d8446 |
09-Sep-2011 |
Mindy Pereira <mindyp@google.com> |
Update logic to look for the correct token if there are multiple entries.
This was mistaken for a bug with paste but the actual issue is:
1) enter a recipient
2) enter a few more other recipients
3) enter recipient from step 1 again
4) remove focus to create "more chip"
5) focus: we were not getting the correct recipient position from step
4; we were getting the first instance which was the chip from step 1
Fixes bug:5267557 duplicating an address causes odd behavior
Change-Id: I3fdc27c22820056f5470832e1ed634768283703f
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 9afded4d212243e554c2695c4a2f90c13628e24b |
09-Sep-2011 |
Bryan Mawhinney <bryanmawhinney@google.com> |
Add ability to set overscroll slot count
Change-Id: I10541172d99e1ede5b27bfcef106afadc0e540d4
arousel/java/com/android/ex/carousel/CarouselController.java
arousel/java/com/android/ex/carousel/CarouselRS.java
arousel/java/com/android/ex/carousel/CarouselView.java
arousel/java/com/android/ex/carousel/carousel.rs
|
| efaa38a16baad0f8665ac23f8e0a8ba166daf75d |
09-Sep-2011 |
Hugo Hudson <hugohudson@google.com> |
Fix playback in variable speed audio.
- Recent changes to system/media broke variable speed playback.
- Traced to http://go/android-cl/132098 which presumed that variable
speed playback wasn't using the renamed sample rate field, but we
had our own copy of the field (it wasn't previously available in the
api).
- This cl also fixes the TODO by removing our own copy of the fields,
and using instead the defines from the OpenSL android api directly.
Bug: 5282965
Change-Id: I58033e9299d26d6a05259e4d50708d27fc3fa7e1
ariablespeed/jni/variablespeed.cc
|
| 6caf49d02e7b2a719fc9fdf57e3f8e96dfdf082a |
09-Sep-2011 |
Mindy Pereira <mindyp@google.com> |
Fix excess copy dialogs showing up.
Make sure we send through all events so that long press gets cancelled
by a move (that will scroll)
Fixes bug:5277603 Scrolling a long recipient list falsely triggers copy-paste dialog
Change-Id: I65c1bd6bf0d2055cbfc1758be13d21c5bd16f98a
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 5a197cb9af43e1db6b882d89c23949577ceba9a4 |
08-Sep-2011 |
Mindy Pereira <mindyp@google.com> |
Mke sure we commit chips that are being edited
The isse was that text editing of a chip now holds the chip
in the selected chip field. This makes sure that we commit any chip
that has an invalid id before continuing.
Fixes bug:5277118 Chip layout is weird if there are "+x more" text and a recipient not in your contact list
Change-Id: I7480a3677e1fa1d17e365c3057dd74ae46ede858
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| d9ae83e0bb529af5c97f9aba73df3e02d1484218 |
08-Sep-2011 |
Mindy Pereira <mindyp@google.com> |
Merge "Clear the checked position and reset it always."
|
| e9278b0f8b883a987a913c5d785455f5d0e646a9 |
08-Sep-2011 |
Mindy Pereira <mindyp@google.com> |
Clear the checked position and reset it always.
I beleive this fixes the issues reported internally this morning, as
previously the checked position ws being incorrectly cached.
fixes bug:5274898 trouble picking the right email addresses for people in gmail
Change-Id: I442a9a3c1b147de41a48bb8b3e72492083bf1f03
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 97e106b1466be9e5972f8e0b73f0184750aec726 |
08-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| ec19bf7a5f4382f716d1176b27ad3856aeea7d78 |
08-Sep-2011 |
Mindy Pereira <mindyp@google.com> |
Merge "New assets for chips backgrounds."
|
| be589954f16adcef1a3a929921d6788e83b8e085 |
08-Sep-2011 |
Mindy Pereira <mindyp@google.com> |
New assets for chips backgrounds.
Change-Id: I4e768a0e6006d42c227053625713f676affea447
hips/res/drawable-hdpi/chip_background.9.png
hips/res/drawable-hdpi/chip_background_invalid.9.png
hips/res/drawable-hdpi/chip_background_selected.9.png
hips/res/drawable-mdpi/chip_background.9.png
hips/res/drawable-mdpi/chip_background_invalid.9.png
hips/res/drawable-mdpi/chip_background_selected.9.png
hips/res/drawable-xhdpi/chip_background.9.png
hips/res/drawable-xhdpi/chip_background_invalid.9.png
hips/res/drawable-xhdpi/chip_background_selected.9.png
hips/res/values/styles.xml
|
| 0436c36bd529ea8ee1864a3017f9ac29d2311c08 |
07-Sep-2011 |
Mindy Pereira <mindyp@google.com> |
Create dialog at the beginning so we have a "safe" context.
I believe this fixes bug:5268040 com.google.android.gm: android.view.WindowManager$BadTokenException: Unable to add window -- token android.os.BinderProxy@412b42e8 is not valid; is your activity running? at android.view.ViewRootImpl.setView(ViewRootImpl.java:494)
Change-Id: I94e7be1d18d2df955f49eefe2d57b608e907b3ac
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 4ebaad0d123206c273955b8d761027350d14ac6b |
07-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| c1efc781e2a33fda0cf81965b8f7b372292c8d84 |
06-Sep-2011 |
Eric Fischer <enf@google.com> |
Merge "Import revised translations."
|
| a9290285923e7a0687eb17e9351306b631da1204 |
05-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| e863816a885b0a0e1a0930969fe3e818f68f2478 |
02-Sep-2011 |
Flavio Lerda <flerda@google.com> |
Enables detailed logging during variable speed playback.
This commit adds support for dynamically enabling logging in the
variable speed library if log.tag.VariableSpeed is set.
After this change, you can enable logging by running:
adb shell setprop log.tag.VariableSpeed 1
Logging will be disabled after reboot or after running:
adb shell setprop log.tag.VariableSpeed ""
The logging in the library is quite verbose, so we do not want to enable
it by default.
Bug: 5253004
Change-Id: I3addde5552093eb0c4926b67245d578a7da0fb7a
ariablespeed/jni/variablespeed.cc
|
| cb95ba0900f71b042527d69d22025fe8ce86d247 |
03-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| 409bbd95e9979dc0631f8afe10ad8a300ac90f3a |
02-Sep-2011 |
Eric Fischer <enf@google.com> |
Import revised translations.
Change-Id: Iaf1b05b79b8628a1453fbb94e04eee3fbb72fe8b
arousel/test/res/values-ro/strings.xml
arousel/test/res/values-zh-rTW/strings.xml
|
| dc442b4d99512bf7c41ee5ceae6c93a3c3568b57 |
31-Aug-2011 |
Flavio Lerda <flerda@google.com> |
Allows selecting the audio stream used for playback.
Adds setAudioStreamType() to the MediaPlayerProxy interface and
implements it in the variable speed player.
Bug: 5240848
Change-Id: I1bb9fdbee7aa6113c5d5d5a8000e9794800fad9f
ariablespeed/jni/jni_entry.cc
ariablespeed/jni/variablespeed.cc
ariablespeed/jni/variablespeed.h
ariablespeed/src/com/android/ex/variablespeed/EngineParameters.java
ariablespeed/src/com/android/ex/variablespeed/MediaPlayerProxy.java
ariablespeed/src/com/android/ex/variablespeed/SingleThreadedMediaPlayerProxy.java
ariablespeed/src/com/android/ex/variablespeed/VariableSpeed.java
ariablespeed/src/com/android/ex/variablespeed/VariableSpeedNative.java
|
| fea69c89880588b28072fc5ac0edbe807b84945e |
30-Aug-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| bb9564805be0ccb91fb420b3139cbc59633f1b1c |
30-Aug-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| 00ae0bb1b719abd6e88e695b56488dd1bb4d0e5d |
30-Aug-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| aabf88787c8edb2cc207ad8e94e2045bf727c60d |
29-Aug-2011 |
Mindy Pereira <mindyp@google.com> |
Merge "Dont show copy dialog when the user is editing a contact. Fix crash."
|
| 2f5589283d93933751c20791ef42dc7eab87061a |
29-Aug-2011 |
Mindy Pereira <mindyp@google.com> |
Dont show copy dialog when the user is editing a contact. Fix crash.
Fixes bug:5210400 Email address only chips sometimes display "Copy email adress" even on tap
Also fixed crash in the alternates adapter where it was still looking for a dest type.
Change-Id: I97b68c3f3e45f3d654551953ac4356ff76dfba26
hips/src/com/android/ex/chips/RecipientAlternatesAdapter.java
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| c2d40afc9d06524aba9818bcd7f814f80d12493c |
29-Aug-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| d2772c48b3ba3cb78f814f83f4a65bbac2cf8337 |
27-Aug-2011 |
Hugo Hudson <hugohudson@google.com> |
Fix the audio stutter during playback.
- Was using the base pointer from callback context when I meant to be
using the 'current position' pointer.
Bug: 5114126
Change-Id: Ie9baded973672cd8ac7ffe0f16f1bdf22c8f1030
ariablespeed/jni/variablespeed.cc
|
| d96a96d8f74d1f83dba2f63e37149a13631be9fd |
27-Aug-2011 |
Mindy Pereira <mindyp@google.com> |
Merge "Fix the height of the chips fields."
|
| ce67e2899bde5a3dc61e5b589bee430d283eaa02 |
27-Aug-2011 |
Eric Fischer <enf@google.com> |
Merge "Import revised translations."
|
| d576a1f12d4ff83dc86c5c2f1720b318a4650df9 |
27-Aug-2011 |
Mindy Pereira <mindyp@google.com> |
Fix the height of the chips fields.
Requires changes in email and gmail, too.
Fixes bug:5223556 heights of compose view text fields are too tall on phone/ tablet
Change-Id: If93c858404a3774ddc3e13a1aefd9946ec311015
hips/res/values/styles.xml
|
| 037c57255aa526d1b5834377283c46b1bddd1ff8 |
26-Aug-2011 |
Eric Fischer <enf@google.com> |
Import revised translations.
Change-Id: I67796f3c85ece30d3ad06b33eed63d7e85ad8eba
arousel/test/res/values-af/strings.xml
arousel/test/res/values-am/strings.xml
arousel/test/res/values-ar/strings.xml
arousel/test/res/values-bg/strings.xml
arousel/test/res/values-ca/strings.xml
arousel/test/res/values-cs/strings.xml
arousel/test/res/values-da/strings.xml
arousel/test/res/values-de/strings.xml
arousel/test/res/values-el/strings.xml
arousel/test/res/values-es/strings.xml
arousel/test/res/values-fa/strings.xml
arousel/test/res/values-fi/strings.xml
arousel/test/res/values-fr/strings.xml
arousel/test/res/values-hr/strings.xml
arousel/test/res/values-hu/strings.xml
arousel/test/res/values-in/strings.xml
arousel/test/res/values-iw/strings.xml
arousel/test/res/values-ja/strings.xml
arousel/test/res/values-ko/strings.xml
arousel/test/res/values-lt/strings.xml
arousel/test/res/values-lv/strings.xml
arousel/test/res/values-nb/strings.xml
arousel/test/res/values-nl/strings.xml
arousel/test/res/values-pt-rPT/strings.xml
arousel/test/res/values-pt/strings.xml
arousel/test/res/values-ro/strings.xml
arousel/test/res/values-ru/strings.xml
arousel/test/res/values-sk/strings.xml
arousel/test/res/values-sl/strings.xml
arousel/test/res/values-sr/strings.xml
arousel/test/res/values-sv/strings.xml
arousel/test/res/values-sw/strings.xml
arousel/test/res/values-th/strings.xml
arousel/test/res/values-tl/strings.xml
arousel/test/res/values-tr/strings.xml
arousel/test/res/values-uk/strings.xml
arousel/test/res/values-vi/strings.xml
arousel/test/res/values-zh-rCN/strings.xml
arousel/test/res/values-zh-rTW/strings.xml
arousel/test/res/values-zu/strings.xml
hips/res/values-af/strings.xml
hips/res/values-am/strings.xml
hips/res/values-ar/strings.xml
hips/res/values-bg/strings.xml
hips/res/values-ca/strings.xml
hips/res/values-cs/strings.xml
hips/res/values-da/strings.xml
hips/res/values-de/strings.xml
hips/res/values-el/strings.xml
hips/res/values-es/strings.xml
hips/res/values-fa/strings.xml
hips/res/values-fi/strings.xml
hips/res/values-fr/strings.xml
hips/res/values-hr/strings.xml
hips/res/values-hu/strings.xml
hips/res/values-in/strings.xml
hips/res/values-iw/strings.xml
hips/res/values-ja/strings.xml
hips/res/values-ko/strings.xml
hips/res/values-lt/strings.xml
hips/res/values-lv/strings.xml
hips/res/values-nb/strings.xml
hips/res/values-nl/strings.xml
hips/res/values-pt-rPT/strings.xml
hips/res/values-pt/strings.xml
hips/res/values-ro/strings.xml
hips/res/values-ru/strings.xml
hips/res/values-sk/strings.xml
hips/res/values-sl/strings.xml
hips/res/values-sr/strings.xml
hips/res/values-sv/strings.xml
hips/res/values-sw/strings.xml
hips/res/values-th/strings.xml
hips/res/values-tl/strings.xml
hips/res/values-tr/strings.xml
hips/res/values-uk/strings.xml
hips/res/values-vi/strings.xml
hips/res/values-zh-rCN/strings.xml
hips/res/values-zh-rTW/strings.xml
hips/res/values-zu/strings.xml
|
| d70e8c954a2f7e5f85f2a1588bc07a0500748e45 |
26-Aug-2011 |
Paul Westbrook <pwestbro@google.com> |
Remove label from chips
Bug: 5220741
Change-Id: If1c9423c253301209e7ca9af8c898891f6a8b98b
hips/res/layout/chips_recipient_dropdown_item.xml
hips/src/com/android/ex/chips/BaseRecipientAdapter.java
|
| 1a7ff258497042b69362e2418d35fb5e3816c9ca |
24-Aug-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| 744a03849305a7936741b92dbdc1cc7a7a67802a |
23-Aug-2011 |
Daisuke Miyakawa <dmiyakawa@google.com> |
Use ICS release name instead of version code
Bug: 5148810
Change-Id: I1b4d5d6280fb94e8cd514e3379aecee888eba479
ommon/java/com/android/common/contacts/DataUsageStatUpdater.java
|
| 547039a2ca631c0c8690881ceef570d479050ddc |
23-Aug-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| 358d0e1b3d2830032cabf4e678c7a6b264ae4f77 |
22-Aug-2011 |
Eric Fischer <enf@google.com> |
Import revised translations.
Change-Id: I4eded0d405b56903aa46596f8c688d99d8c11abe
arousel/test/res/values-en-rGB/strings.xml
arousel/test/res/values-es-rUS/strings.xml
arousel/test/res/values-it/strings.xml
arousel/test/res/values-ms/strings.xml
arousel/test/res/values-pl/strings.xml
hips/res/values-en-rGB/strings.xml
hips/res/values-es-rUS/strings.xml
hips/res/values-it/strings.xml
hips/res/values-ms/strings.xml
hips/res/values-pl/strings.xml
|
| ec7a720058cedf070bb1a7ef0542c65c0b6ad936 |
22-Aug-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| 97b873c0ba4f31b7e14abad8d873c35e66f7dc41 |
17-Aug-2011 |
Mindy Pereira <mindyp@google.com> |
Center text in chip; fix dropdown item spacing
Part of bug:5162602 Alignment of elements in compose screen seems off (master/tot/prime)
Change-Id: I6ed2063c164ff7dbe3aa7b030a500176b16eb301
hips/res/layout/chips_recipient_dropdown_item.xml
hips/res/values/styles.xml
hips/src/com/android/ex/chips/RecipientChip.java
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 5eafe7264c78ce298cba9e12896382a22c714f7e |
17-Aug-2011 |
Mindy Pereira <mindyp@google.com> |
Fix focus issues for chips fields.
Since its the validation part we don't want, just override that part.
Let the calls that handle focus go through as planned otherwise.
fixes b/5177339 Compose screen broken in Gmail
Change-Id: If00069e975449bc338ad52356c44124664f1b909
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| b67763f7bccadc3a34037d9d47c7f3107f639195 |
17-Aug-2011 |
Mindy Pereira <mindyp@google.com> |
Fix focus issues for chips fields.
Since its the validation part we don't want, just override that part.
Let the calls that handle focus go through as planned otherwise.
fixes b/5177339 Compose screen broken in Gmail
Change-Id: If00069e975449bc338ad52356c44124664f1b909
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 6939128594ecad8b2bf5fc4a29a42abe67f3b226 |
17-Aug-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| 6f9f2858818228eaa1f2a2c562f4d2da6a4216b3 |
16-Aug-2011 |
Mindy Pereira <mindyp@google.com> |
Fix bugs with shrinking/expanding chips field.
fixes Bug:5161746 Address chips lose chippiness after expanding/collapsing the textview
Also, fixup change from @debunne: the field is textMultiline
Change-Id: I379fe6a4833a9f08cad9168f22178ebd3492ac6e
hips/src/com/android/ex/chips/RecipientChip.java
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 572fa15d4b847c2d890b972d4f69d4d2aad5ebd7 |
16-Aug-2011 |
Gilles Debunne <debunne@google.com> |
Suggestions disabled using input type text flag.
Change-Id: I8e5b25425bc463dac7a423af4daf479c23328892
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 0a3af5fccfd3ca95afac545f664e4a05c3e56610 |
11-Aug-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| 85eb27828b0ca3bb22a77d27d5e0ed4ce7d84f5a |
11-Aug-2011 |
Hugo Hudson <hugohudson@google.com> |
Merge "Fix a rare crash."
|
| 64f5ba670d215847192b4ff46dc4538565f2f551 |
10-Aug-2011 |
Hugo Hudson <hugohudson@google.com> |
Fix a rare crash.
- Crash could be reproduced by seeking to the very end of a voicemail,
playing the voicemail to see the ui reset to beginning, then
increasing rate.
- Reason was that during playback, insufficient data has been read to
read the sample rate and channels, and in that situation the increase
rate requires constructing the time scaler, which in turn requires
a valid sample rate and channels.
- Added a test to prove that the bug exists, and to prove the fix which
is to ignore the rate change call when sample rate and channels not
known.
- Also added another unit test in the process to verify that it's safe
to call set rate at any point during the life cycle of the player.
Bug: 5140693
Change-Id: I474e5769f2b72762348534e4d06104af247e8726
ariablespeed/jni/variablespeed.cc
ariablespeed/tests/src/com/android/ex/variablespeed/MediaPlayerProxyTestCase.java
|
| 4d83570dbe7c53863818427013bd4d287f2ec292 |
10-Aug-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| 719cef49a6c16c1aa089ab9d8c34194777adbaa6 |
10-Aug-2011 |
Mindy Pereira <mindyp@google.com> |
Deprecate old setChipDimensions.
Unused.
Change-Id: I1ee69bfb316a8d2fe527d8c07ad956ec19da7bca
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| b8208f24b2768acf369ad58309031feac87ce79c |
10-Aug-2011 |
Mindy Pereira <mindyp@google.com> |
Add ability to copy a single recipient chip.
Fixes b/5143564 implement single chip copy
Change-Id: I598a53a60ba29b99637b2d1633b3884811938317
hips/res/layout/copy_chip_dialog_layout.xml
hips/res/values/attrs.xml
hips/res/values/strings.xml
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 2b3f5af5e43cebe79b60db14b431bbc25c8fe2c1 |
09-Aug-2011 |
Stephen Hines <srhines@google.com> |
Merge "Stop building with older SDK."
|
| 6ccb1744887c175ced43491433b382f7c8f51e83 |
09-Aug-2011 |
Mindy Pereira <mindyp@google.com> |
Always tokenize the address if possible before creating a chip.
Change-Id: I0bf39bb0c0f49a674731a7f1a7b518a4913f6a51
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| cf9756f0b93f86c6dba08d9101db1794fd47f615 |
09-Aug-2011 |
Stephen Hines <srhines@google.com> |
Stop building with older SDK.
This causes issues with our new header file structure for Renderscript,
since the build system is using the modern llvm-rs-cc with preexisting
header files from before ICS.
Change-Id: Ie20c7ee445451d2dcc12f7082f03d7204d1e8bf3
arousel/Android.mk
|
| 0d5e019bacc8479ff9d0b5091866f71dfa727505 |
09-Aug-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| 5f65e43cf103514ddb69abca7cc78dfe99cd329c |
09-Aug-2011 |
Hugo Hudson <hugohudson@google.com> |
Prove that there's an issue with media player audio.
- File format of files downloaded from GoogleVoice:
MPEG ADTS, layer III, v2.5, 32 kbps, 8 kHz, Monaural
- If we seek in that file before beginning playback, there is a very
obvious triple/quadruple stutter.
- This adds a unit test that plays such a file after seeking, which
clearly demonstratest the stutter on my variable speed library.
- This same test can be used to demonstrate the stutter with the regular
MediaPlayer.
Other:
- Also adds the correct ADD_VOICEMAIL permission, which was renamed
earlier.
Bug: 5114126
Change-Id: I3dfaf7686c879076d9949047d91875010b6d8b52
ariablespeed/tests/AndroidManifest.xml
ariablespeed/tests/assets/fake_voicemail.mp3
ariablespeed/tests/assets/fake_voicemail2.mp3
ariablespeed/tests/src/com/android/ex/variablespeed/MediaPlayerProxyTestCase.java
|
| 454eaf31f312fd2f2e6bc3d30bb050d65079a9a0 |
08-Aug-2011 |
Mindy Pereira <mindyp@google.com> |
Make sure that email addresses are editable when tapped when there is no associated display name.
fixes Bug:5135630 email chip issue
Change-Id: I9fccc192bfa4e97cbae9dbb527090b1e437264e8
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| bfa63c7c85405200eb6a049c7209657440a4b1fd |
08-Aug-2011 |
Mindy Pereira <mindyp@google.com> |
Create way to allow applications to still show all recips when focus is lost.
Fixes Bug:5123976 RecipientEditTextView has no way to turn off the 'X more' collapsing of names
Change-Id: I5c7f5fca9a6bf278cb2e043ea796f9d2646d6087
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 512fdebf71fff2e7d5cc9bb1d78b1875527b115b |
08-Aug-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| 3b06f705aa8a7fce57a28a7253736fe4de5442ab |
05-Aug-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| 490556a764a879cd0eaff358e90705cc1335c92e |
05-Aug-2011 |
Erik <epastern@google.com> |
b/5122753 Make Rfc822Validator a bit smarter
Change-Id: Iffea9735b906466077ce03a97ab49b614917dbf3
hips/src/com/android/ex/chips/RecipientEditTextView.java
ommon/java/com/android/common/Rfc822Validator.java
ommon/tests/src/com/android/common/Rfc822ValidatorTest.java
|
| 311576adc68a068ab583d794e064329b0f71b8d1 |
05-Aug-2011 |
Mindy Pereira <mindyp@google.com> |
Make sure we clear our local text watcher variable when removing text watcher.
Fixes Bug:5124057 RecipientEditTextView stops chipifying things when you switch between enabled and not enabled
Change-Id: I7c2708033d5574621ab95065077a3ff39595cd5b
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| a0751874f5bbdb39f2024c69a5024df60f0344d9 |
05-Aug-2011 |
Andy Stadler <stadler@google.com> |
Fix eclipse error and a couple of warnings.
Change-Id: I25f13e7a5113078a5f8fe4e33eabd0603277a1b4
hips/src/com/android/ex/chips/RecipientEditTextView.java
hips/src/com/android/ex/chips/SingleAddressAdapter.java
hips/src/com/android/ex/chips/SingleRecipientArrayAdapter.java
|
| fe5f198e9837a6a0d7c8026f25a347d22d183e13 |
04-Aug-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| 1dbe9713a96262d1538e8ccf59fa70513fcd154d |
03-Aug-2011 |
Mindy Pereira <mindyp@google.com> |
Merge "Fix style of autocompletetextview we use for chips."
|
| c4436569b5f42187a4427c40b632e37cfe10d78e |
03-Aug-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| 85dae977671b9e76c0b6660dd8d93fe7de4d4a56 |
03-Aug-2011 |
Mindy Pereira <mindyp@google.com> |
Fix style of autocompletetextview we use for chips.
Fixes Bug:5111405 Email auto-complete is using wrong theme?
Change-Id: I6b35aeaa9daf42bd90b7c24ff389949985da8fa0
hips/res/values/styles.xml
|
| 007bf6aef9cbc05e1a772b1d5e86de159a715b11 |
02-Aug-2011 |
Daisuke Miyakawa <dmiyakawa@google.com> |
Use AsyncTask for photo loading
Using a static thread isn't appropriate, since it won't quit
itself and thus will be persistent even after it becomes
unnecessary.
Bug: 5057798
Change-Id: Ibca2b59c18a326d1c3fd724817bc602583f37842
hips/src/com/android/ex/chips/BaseRecipientAdapter.java
|
| 0f3b4710fc344f28610b70b1c1ac1d4ff46f0606 |
02-Aug-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| e0de3782e846811ae33c021cc163de9195ef8dca |
01-Aug-2011 |
Mindy Pereira <mindyp@google.com> |
Updated background assets for chips.
Change-Id: Ia34c47ed4d4c0e745f1eb0314b18d049993dce6a
hips/res/drawable-hdpi/chip_background.9.png
hips/res/drawable-hdpi/chip_background_invalid.9.png
hips/res/drawable-hdpi/chip_background_selected.9.png
hips/res/drawable-mdpi/chip_background.9.png
hips/res/drawable-mdpi/chip_background_invalid.9.png
hips/res/drawable-mdpi/chip_background_selected.9.png
hips/res/drawable/chip_background.xml
hips/res/drawable/chip_background_invalid.xml
hips/res/drawable/chip_background_normal.xml
hips/res/drawable/chip_background_selected.xml
|
| c488ca4ff24253ca97ac84294cd7e60c53bed35c |
01-Aug-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| ae12edea6a956e9bb6e0291a97463a3c699059b7 |
29-Jul-2011 |
Hugo Hudson <hugohudson@google.com> |
Merge "Playback now handles any sample rate and channel combo."
|
| 0bd6ec5bc06b869131ee0facf38ff02f81f65c10 |
26-Jul-2011 |
Hugo Hudson <hugohudson@google.com> |
Playback now handles any sample rate and channel combo.
Main stuff
- Delayed construction of audio player until after sample rate and
channels have been read from the first callback.
- Removed all sample rate and channels from outward facing api.
- Remove pause playing and prefetch duration and sample rate hacky code.
- Fixes handling of any sample rate by removing switch statement.
- Fixes a HORRIBLE bug introduced in last cl where I was creating the
callback context on the stack inside a method call, and using it a
pointer to it long after the object had been erased from the stack.
[worse yet: it still mostly worked fine!]
Other
- Fixes an obvious failure case of all tests - duh - I was calling setUp()
before setting the executor properly, so they were giving NPEs.
- Correct calculation of totalDuration now done on first decode callback.
- This will let us remove MediaPlayer from prepare() in follow up.
- Initializing the engine outside of the PlaybackRunnable, is cleaner.
- Adds static methods for reading duration and position, again so that
follow up can have accurate get current position rather than best guess.
- Buffers in use for decoding also not created until first decode callback.
- Introduces some wicked-cool OpenSL macro to log api calls, make the
api calls and check the result value.
Bug: 5048252
Bug: 5048257
Change-Id: I60705fa6c6ab29a35740f22bef76450e8c1d25a2
ariablespeed/jni/jni_entry.cc
ariablespeed/jni/variablespeed.cc
ariablespeed/jni/variablespeed.h
ariablespeed/src/com/android/ex/variablespeed/EngineParameters.java
ariablespeed/src/com/android/ex/variablespeed/VariableSpeed.java
ariablespeed/src/com/android/ex/variablespeed/VariableSpeedNative.java
ariablespeed/tests/src/com/android/ex/variablespeed/VariableSpeedTest.java
|
| d58667fc7a460b8b56ccf9f0c35b92a2a9e0419c |
28-Jul-2011 |
Mindy Pereira <mindyp@google.com> |
Protect againt emtpy strings/ null tokens.
fixes b/5090742 java.lang.ArrayIndexOutOfBoundsException: length=0; index=0
Change-Id: I23fdbe6ebbd94e3ce0f7ac19b52ac02ae755fb01
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| c166c37d3d5646b2fdffc5342dbd0fa6fcc28e11 |
27-Jul-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| 4221a1d7cab69fd886c03abf53f2250025367f5e |
26-Jul-2011 |
Mindy Pereira <mindyp@google.com> |
Protect against empty display or address.
Fixes bug: 5080535 NPE observed in Email when entered invalid email address
Change-Id: If7517dd5283c2215eff5ff88b89b4d314c2d079b
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| dcc23bc607c69d619cabc8a3a774b10311afd574 |
26-Jul-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| 6ebf62290f81d267b85f0237a49daa4c9b3846ef |
25-Jul-2011 |
Mindy Pereira <mindyp@google.com> |
Update chips to match new spec for validation.
Fixes bug:5051766 autocomplete a recipient with the sender's domain
Spec is defined in the bug notes.
Also fixes 2 small issues:
1) when not appending text, we werent adding the text watcher.
Adds it automatically now and just removes it as necessary.
2) the cursor was not apeparing when editing a recipient
Change-Id: I6bebc418fccf4ef52a3913cb83bdc3bacc5000d3
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| c0f97e4f56bc35d99d181c5f604b26fbb89c113f |
25-Jul-2011 |
Mindy Pereira <mindyp@google.com> |
Make more chip, dropdown match pixel perfects.
1) the destination type should be uppercase; there is not
textview style to do this
2) fix the heights of the dropdown items to be 48dip
3) text for more says "NUMBER more..." and is styled
Change-Id: I8a391bbd3703c1ccd1415b78d5e843107b1d2095
hips/res/layout/chips_recipient_dropdown_item.xml
hips/res/layout/more_item.xml
hips/res/values/strings.xml
hips/src/com/android/ex/chips/BaseRecipientAdapter.java
hips/src/com/android/ex/chips/RecipientAlternatesAdapter.java
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 008d3b2afd2a11eaa67cf38fd1defb54edc4286f |
25-Jul-2011 |
Mindy Pereira <mindyp@google.com> |
Remove deprecated separators.
Change-Id: I734eec28ba5d51afb17ac5150e156ed9e87de4ac
hips/res/layout/chips_separator.xml
hips/res/layout/chips_separator_within_group.xml
hips/src/com/android/ex/chips/BaseRecipientAdapter.java
|
| 886150f6f05991d33a57213274bd51f94140f4e3 |
25-Jul-2011 |
Mindy Pereira <mindyp@google.com> |
These extra separators are not needed given the design.
In this pass, making the associated methods non abstract.
will remove them from the apps, then remove the deprecated methods.
Change-Id: I3f9908e5807253294630c17e52ae6562abd0ddc3
hips/src/com/android/ex/chips/BaseRecipientAdapter.java
hips/src/com/android/ex/chips/RecipientEntry.java
|
| ae905458d587a9cae0dc0adfa2155342fbdb4947 |
25-Jul-2011 |
Hugo Hudson <hugohudson@google.com> |
Merge "Adds tests for Variable Speed code."
|
| 9730f15ebbf4b64cd48e0777850e56cb516a9ed4 |
25-Jul-2011 |
Hugo Hudson <hugohudson@google.com> |
Adds tests for Variable Speed code.
The test changes:
- Adds many, many test cases against a MediaPlayerProxy, checking that
it behaves to the contract of a MediaPlayer.
- Adds the RealMediaPlayer class to check a real MediaPlayer.
- Adds the VariableSpeed class, to check a VariableSpeed instance
against the same contract as the MediaPlayer.
- Adds an Android.mk for the unit tests.
- Adds also an AndroidManifest.xml for the unit tests.
- Adds some test asset media files (3gpp file and mp3 file).
Required for the test changes:
- Adds a DynamicProxy class to adapt a MediaPlayer as a
MediaPlayerProxy class, i.e. to test the implementation of
MediaPlayerProxy, required to avoid writing an adapter.
- Adds a couple of listeners, OnErrorListener and
OnCompletionListener, that can be waited for synchronously in unit
tests.
Improvements as a result of the tests:
- During the testing, fixes the case where we weren't throwing
IllegalStateException if asked for the duration on released player.
- Refactored the create engine, create and realize output mix, create
and realize audio player, get play interfaces and callbacks, all
separated into their own static methods.
- This allows me to create the audio player during the main while loop
actually after the decoding has begun rather than before starting.
This work is a precursor to using the decoder's report on sample rate
and channels as the input to these methods.
- slSampleRate and slOutputChannels no longer computed in the
constructor, but computed when needed in the construction and
realization of the audio player.
Other changes:
- Remove some overly verbose logs on getDuration() and
getCurrentPosition().
- Adding the decoder interface to the callback.
- Extract metadata from decoder method now takes the metadata
interface, so this will be usable from the decoder callack in a follow
up.
- Temporarily stop getting the metadata out of the decoder, I'm going
to be doing it on the decoding callback instead.
- Renames the comment in AndroidManifest.xml to describe the
correct invocation to run the common tests.
Bug: 5048252
Bug: 5048257
Change-Id: Icdc18b19ef89c9924f73128b70aa4696b4e727c5
ommon/tests/AndroidManifest.xml
ariablespeed/jni/jni_entry.cc
ariablespeed/jni/variablespeed.cc
ariablespeed/jni/variablespeed.h
ariablespeed/src/com/android/ex/variablespeed/VariableSpeed.java
ariablespeed/tests/Android.mk
ariablespeed/tests/AndroidManifest.xml
ariablespeed/tests/assets/README.txt
ariablespeed/tests/assets/count_and_test.3gpp
ariablespeed/tests/assets/quick_test_recording.mp3
ariablespeed/tests/src/com/android/ex/variablespeed/AwaitableCompletionListener.java
ariablespeed/tests/src/com/android/ex/variablespeed/AwaitableErrorListener.java
ariablespeed/tests/src/com/android/ex/variablespeed/DynamicProxy.java
ariablespeed/tests/src/com/android/ex/variablespeed/MediaPlayerProxyTestCase.java
ariablespeed/tests/src/com/android/ex/variablespeed/RealMediaPlayerTest.java
ariablespeed/tests/src/com/android/ex/variablespeed/VariableSpeedTest.java
|
| 30aa02a33a1624d4f3522f24f8c7435a5a41d4c7 |
25-Jul-2011 |
Mindy Pereira <mindyp@google.com> |
Fix the dropdown binding for single alternates adapter.
Was incorrectly placing display in text1, dest in text2
Fixes bug:5073911 chips: single dropdown is displaying things in the wrong place
Change-Id: I1a13aa9b6ea3df838266d8082df8ee03bb21c00f
hips/src/com/android/ex/chips/SingleAddressAdapter.java
|
| b9e50776465ce7363557dc7a7a3897b37119ee07 |
25-Jul-2011 |
Mindy Pereira <mindyp@google.com> |
Merge "Turn off extract mode for chips fields."
|
| 1b533f4b52c2950e1523d8b026348733be133714 |
24-Jul-2011 |
Mindy Pereira <mindyp@google.com> |
Turn off extract mode for chips fields.
Per updated spec. Also, shrinks the height of chips in landscape
mode so that the user can see more content per row.
landscape no extract only for phones
Change-Id: I6dcdabb464f1555a2fe1803ff1597c530398a590
hips/res/values-land/dimen.xml
hips/res/values-sw600dp-land/dimen.xml
hips/res/values-sw600dp/styles.xml
hips/res/values/styles.xml
|
| fd46457d2e1e43153d91f160446c5b44623498d5 |
25-Jul-2011 |
Mindy Pereira <mindyp@google.com> |
Merge "When the application clears the text, make sure we clear all the chips."
|
| 4382b51bad781dca21c3fd4e12b0bcf6969f4c96 |
25-Jul-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| 376a291b7a3016cc85501ee1c044629cce60e75c |
25-Jul-2011 |
Logan Chien <loganchien@google.com> |
Silence the parenthesis warning.
Change-Id: I95527858918366b2fde54a71b0b831dda0551172
arousel/java/com/android/ex/carousel/carousel.rs
|
| 1e70f1a4c71895213a1ea65a1e68ab9cc0b12ad2 |
24-Jul-2011 |
Mindy Pereira <mindyp@google.com> |
When the application clears the text, make sure we clear all the chips.
Fixes Bug:5051774 chips: odd behavior on rotate with some addresses
Gmail was keeping the same recipientedittextfields around, clearing them
by calling setText("") and then re-appending text
However, the old chips were STILL there, just applied to the empty string
This also makes sure we dont put 2 chips in 1 location
Change-Id: I76245a648e71a05018077fcc59f5dfa284d93490
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 4ba58a02cdd687115d1b5b1dc4e047a9211e7327 |
22-Jul-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| 2f825d3fbca5f2ac93b30a7aa90df75b467e6e48 |
07-Jul-2011 |
Mark Brophy <mbrophy@google.com> |
DO NOT MERGE: Add the new global-search field to android-common.
For unbundled apps which don't build against ICS yet,
but need to support this feature.
Cherry-picked from 91b05eafd38f6fbbf87440c6b96c7d4b434ab3db in master.
Change-Id: I3aca93d007ae05e2c59dc8e0613e761ec52ecdea
ommon/java/com/android/common/Search.java
|
| 02c844fe158d55837cf1a1c391f26556e337e55b |
22-Jul-2011 |
Daisuke Miyakawa <dmiyakawa@google.com> |
Stop spawning multiple threads for photo loading
This is not a fundemental fix for the issue but should mitigate
our headache caused by a bunch of phono_handler threads.
Bug: 5057798
Change-Id: I5f81739bf8439f6d3ee726495b23aab4d3e3d0fd
hips/src/com/android/ex/chips/BaseRecipientAdapter.java
|
| 9160cd5d914d6975a5e72920950bd007d05aa7ba |
21-Jul-2011 |
Daisuke Miyakawa <dmiyakawa@google.com> |
show type correctly in alternate listing
Change-Id: I8ca30df876a33d7dde544f1f2a9f59af51cae6d0
hips/src/com/android/ex/chips/RecipientAlternatesAdapter.java
|
| 6549f702a205b7966c3efa92cec5398c846f6ec9 |
21-Jul-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| 8c03d35fec744db28a2a3230795f123c7afd50cc |
20-Jul-2011 |
Daisuke Miyakawa <dmiyakawa@google.com> |
Show address type in auto-complete list
Also tweak layout file for better layouting.
Bug: 5028342
Change-Id: Iff81ed0c3013c65e6a293575f89c12606832838f
hips/res/layout/chips_recipient_dropdown_item.xml
hips/src/com/android/ex/chips/BaseRecipientAdapter.java
hips/src/com/android/ex/chips/RecipientAlternatesAdapter.java
hips/src/com/android/ex/chips/RecipientEntry.java
|
| 7bffb1a8fd8e479207e6ce1ea6c7622a079b8dc4 |
20-Jul-2011 |
Mindy Pereira <mindyp@google.com> |
Fix case where pending chips called before the widget has size.
If there was no size for the widget, we could not determine how
much text to display, so this wasd showing nothing.
Change-Id: I35bc7373fa2a7a4cfd68cfaf68517a0d1381bac6
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| a40ef1489593ee115d2734141cacaace585755b4 |
20-Jul-2011 |
Mindy Pereira <mindyp@google.com> |
Instead of waiting for size changes, always post a runnable when recips appended.
Fixes Bug: 5039293 reply / reply all switching behaves inconsistently
Change-Id: I3a169df3520eac3d88135d65cf491e843894f286
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| e9321ef4bc38f05aa4b448c0d3851f0816838c82 |
20-Jul-2011 |
Mindy Pereira <mindyp@google.com> |
Merge "Add styling to the library so apps can have a properly styled widget."
|
| 66b8155ba31093b219bb8c155853a536086ada88 |
20-Jul-2011 |
Mindy Pereira <mindyp@google.com> |
Add styling to the library so apps can have a properly styled widget.
Change-Id: I2a41c661f8395c9521f9c5af8660f7ba08d56717
hips/res/values/attrs.xml
hips/res/values/styles.xml
|
| 0032561f74d7ca7912106a9fc8bc5a16d49570aa |
20-Jul-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| da9ba566bcc69c99224f263c1474783b12a76799 |
20-Jul-2011 |
Mindy Pereira <mindyp@google.com> |
Merge "fix appended recipients that have an associated name"
|
| 1174eca98d1dbd263a9e72c5a9e35a1039aae979 |
16-Jul-2011 |
Mindy Pereira <mindyp@google.com> |
fix appended recipients that have an associated name
Fixes Bug:5037859 Populating a To: field from a mailto: link always shows an empty chip
The issue here was I was just pulling out the address and
leaving that in the field
Now I pull out the address for display purposes only, and leave the address
and any associated display info with it
NOTE: if the info before the address was invalid, it will stay invalid, as before
Fixes Bug: 5043134 chips: name and rfc email address
Change-Id: I6b0d0de56dd9752b189919554617b101792425ef
hips/src/com/android/ex/chips/RecipientEditTextView.java
hips/src/com/android/ex/chips/RecipientEntry.java
hips/src/com/android/ex/chips/SingleAddressAdapter.java
|
| 5192e36f6c137899e9745b65877324c1974a2d6b |
19-Jul-2011 |
Daisuke Miyakawa <dmiyakawa@google.com> |
Use HC MR3's verison code instead of MR2's
Bug: 5047405
Change-Id: I479778c36b2e6706dd0d171bfbe9123cc45c0217
ommon/java/com/android/common/contacts/DataUsageStatUpdater.java
|
| 3faf8bab8004f1228fdb719346220da9dbd105b6 |
19-Jul-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| 491c1590357075a6a52249c6e8e1597d93939c93 |
19-Jul-2011 |
Shimeng (Simon) Wang <swang@google.com> |
Merge "Enhance the URL Regex script to handle i18n TLDs."
|
| 829b84ec6b4f5fac7eea8da1de3378ce47033838 |
19-Jul-2011 |
Shimeng (Simon) Wang <swang@google.com> |
Enhance the URL Regex script to handle i18n TLDs.
Decode punycode and put in Unicode scripts also into the Regex matcher,
this will match internationalized characters in TopLevelDomains.
issue: 4384739
Change-Id: Ic1aac6e05509f00ef3a2c19a06cacda6e9cd8b42
ommon/tools/make-iana-tld-pattern.py
|
| 5702f06f6fe82b659e504b04b308e0e32423887d |
18-Jul-2011 |
Mark Brophy <mbrophy@google.com> |
am 580eb808: am a3684d4d: Add the new global-search field to android-common.
* commit '580eb80873a75d8b4b0196e77a405f09c195645b':
Add the new global-search field to android-common.
|
| 580eb80873a75d8b4b0196e77a405f09c195645b |
18-Jul-2011 |
Mark Brophy <mbrophy@google.com> |
am a3684d4d: Add the new global-search field to android-common.
* commit 'a3684d4db1a0505efc26d6c9ccedd76a71550e5b':
Add the new global-search field to android-common.
|
| 2dcddc1eddff0a31c316197df42743b63e985ef8 |
17-Jul-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| e8adc2935e128eec6cae87ebfb3959b5bc6ec219 |
17-Jul-2011 |
Daisuke Miyakawa <dmiyakawa@google.com> |
Make divider and loading views unselectable
Bug: 5036748
Change-Id: I397d6a62e577c22ccad9a750ae6a0edb2168ad8b
hips/src/com/android/ex/chips/BaseRecipientAdapter.java
hips/src/com/android/ex/chips/RecipientEntry.java
|
| a3684d4db1a0505efc26d6c9ccedd76a71550e5b |
07-Jul-2011 |
Mark Brophy <mbrophy@google.com> |
Add the new global-search field to android-common.
For unbundled apps which don't build against ICS yet,
but need to support this feature.
Cherry-pick of approved CL https://android-git.corp.google.com/g/#change,119596
into BooksPhone release branch
Change-Id: I5c32e3d0ae2149c6ac355463231e19fdf37cc2f9
ommon/java/com/android/common/Search.java
|
| be9da4c9266bc5110c91659c0e87c13f87023925 |
15-Jul-2011 |
Hugo Hudson <hugohudson@google.com> |
Merge "Initial check-in of variable speed playback library."
|
| b83ad73794088498d6d38cd3b4fc9311f505d051 |
15-Jul-2011 |
Hugo Hudson <hugohudson@google.com> |
Initial check-in of variable speed playback library.
Contains an implementation of time-domain audio scaler, for
pitch-invariant speed up and slow-down of audio.
Contains wrapper library using OpenSLES to pump audio from
encoded stream (mp3 file etc) through audio decoder then
through time scaler and out to media player.
This is written as a jni library with jni hooks to allow
driving of this from the Java side.
The other part of this cl is the Java wrapper. There is a
new interface MediaPlayerProxy, containing a subset of the
methods found on the MediaPlayer. The VariableSpeed class
provides a concrete implementation of this interface
adapting to the jni code.
Change-Id: I518d8bf703488628c00730241a08ebfb67588ca6
ariablespeed/Android.mk
ariablespeed/jni/Android.mk
ariablespeed/jni/decode_buffer.cc
ariablespeed/jni/decode_buffer.h
ariablespeed/jni/hlogging.h
ariablespeed/jni/integral_types.h
ariablespeed/jni/jni_entry.cc
ariablespeed/jni/macros.h
ariablespeed/jni/no_synchronization.h
ariablespeed/jni/profile_timer.h
ariablespeed/jni/ring_buffer.cc
ariablespeed/jni/ring_buffer.h
ariablespeed/jni/sola_time_scaler.cc
ariablespeed/jni/sola_time_scaler.h
ariablespeed/jni/variablespeed.cc
ariablespeed/jni/variablespeed.h
ariablespeed/src/com/android/ex/variablespeed/EngineParameters.java
ariablespeed/src/com/android/ex/variablespeed/MediaPlayerDataSource.java
ariablespeed/src/com/android/ex/variablespeed/MediaPlayerProxy.java
ariablespeed/src/com/android/ex/variablespeed/SingleThreadedMediaPlayerProxy.java
ariablespeed/src/com/android/ex/variablespeed/VariableSpeed.java
ariablespeed/src/com/android/ex/variablespeed/VariableSpeedNative.java
|
| 1e85502fdc04a44f76ffa9904be9ab6ab80292ce |
15-Jul-2011 |
Erik <epastern@google.com> |
b/5021471 Don't try to chipify null entries
Change-Id: I6f89fcdb5373df4fba48681ad6e7bd260dad0f8d
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| b31c537aff4d03e87a7071a4f6628019f4394ac6 |
14-Jul-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| 409fc12c707e39b55303251b728787ee5147b468 |
14-Jul-2011 |
Hugo Hudson <hugohudson@google.com> |
Merge "Adds the MoreCloseables utility file."
|
| c3d793fa781ad98e4df1c6ddd3a2bdeedafcda12 |
14-Jul-2011 |
Hugo Hudson <hugohudson@google.com> |
Adds the MoreCloseables utility file.
- This has methods for closing objects iff they are not-null, in
exactly the same way as Closeables, but for objects that don't
implement the Closeable interface.
- Specifically at the moment this involves Cursor and
AssetFileDescriptor objects.
Change-Id: I92e8719e6deab7652f940d129594cdee3c8f3061
ommon/java/com/android/common/io/MoreCloseables.java
|
| d8843738d9843ef67fba69ced485266b508fe0ac |
14-Jul-2011 |
Mindy Pereira <mindyp@google.com> |
Update suggestions dropdown to match pixel perfect layouts.
Change-Id: I0ced5414470d9a452da7296d217228802bb60ca1
hips/res/drawable-hdpi/check_selected.9.png
hips/res/drawable-mdpi/check_selected.9.png
hips/res/drawable/bg_separator_inset.xml
hips/res/drawable/chip_background_selected.xml
hips/res/drawable/list_item_background.xml
hips/res/drawable/list_item_font_primary.xml
hips/res/drawable/list_item_font_secondary.xml
hips/res/layout/chips_alternate_item.xml
hips/res/layout/chips_recipient_dropdown_item.xml
hips/res/layout/chips_separator.xml
hips/res/layout/chips_separator_within_group.xml
hips/res/values/attrs.xml
hips/res/values/colors.xml
|
| 29292772467cf521599dcd487de6b1807dec3e02 |
05-Jul-2011 |
Daisuke Miyakawa <dmiyakawa@google.com> |
Remove cursor passing.
We've used Cursor objects among two threads (UX thread and
filter thread), which is possible but not feasible enough.
- Filter removes message for the filter thread before sending
another message to UX thread, which it looks causing
a lot of warnings.
- A cursor consumes mega bytes of memory, while we want to
have are just ~10 results in it.
Also remove Phone related codes. We found we won't use it
now.
Bug: 5017608
Change-Id: Ic50d27c5ed84a23dfabaf705996630b6548a06cf
hips/src/com/android/ex/chips/BaseRecipientAdapter.java
|
| aaa3d987e07bb8f1ae4bd06d26bb6e26d679f6aa |
13-Jul-2011 |
Daisuke Miyakawa <dmiyakawa@google.com> |
Stop warm-up query.
We should introduce similar mechanism, but right now not.
Bug: 5009038
Bug: 5012014
Change-Id: I883f312fdcef1ef209fb6e620a74d90aa23241a0
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 0bd2f901b66dce9451889565bae6c898172b871e |
13-Jul-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| c1564e400a60414db1eccbdf6de3913a3e1a8504 |
13-Jul-2011 |
Mindy Pereira <mindyp@google.com> |
Handle case where the contact name is null.
When the contact name is null, set the contact name to the destination.
Fixes Bug: 5022659 NPE during auto-complete; appears to be chips related
Change-Id: If081be06ed4babb7484eec7d10fdedf713a4f240
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 001f6063c1a2f447bb4dc90a31d2fd0a745c7fc1 |
13-Jul-2011 |
Mindy Pereira <mindyp@google.com> |
Make sure we always check that we have committed all chips on shrink.
Fixes Bug:5010791 ICS email: addressee details lost when retrieving a saved draft on IMAP
Change-Id: I0ee06a983c5ec8814681890c20778cefeffecb2b
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 7baf165a97b878f404fef258586328d0fdca4b73 |
12-Jul-2011 |
Mindy Pereira <mindyp@google.com> |
Merge "Enable pasting of text into the recipient edit text field."
|
| 090139db34b366608b60e73f312833d84cf42259 |
12-Jul-2011 |
Mindy Pereira <mindyp@google.com> |
Enable pasting of text into the recipient edit text field.
The issue was that we were hiding the cursor whenever the field was touched
and it should have just been when the field was touched AND a chip was selected.
fixes Bug:5016914 ICS email: cannot paste text into "to:" field in portrait mode compose message
Also fix the case where there is content and the user changes focus.
This had not been committing as committing chips depended on having focus.
Change-Id: I43fae67a399ae7df4862861144ed42b608718a2c
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| e73c9cb18566c412914ea0b57ed965826250df96 |
12-Jul-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| a601adc796fa7276771e6ab2670bf50663555489 |
11-Jul-2011 |
Daisuke Miyakawa <dmiyakawa@google.com> |
Show "Waiting for more contacts" message on directory load
Requires
- I458c4b068d91feb16fe12c3b813f9704668663d2
- I5f83103628c14dd5079515c46c42a6f43d4f194c
- I858c66faa6d5bcb3248da6be6a40f47ab0f00a4d
Bug: 4996797
Change-Id: Iad5b8444f4b1949666d93ad43a34de057aba560e
hips/res/layout/chips_waiting_for_directory_search.xml
hips/res/values/attrs.xml
hips/res/values/strings.xml
hips/src/com/android/ex/chips/BaseRecipientAdapter.java
hips/src/com/android/ex/chips/RecipientEntry.java
|
| 4c514e6055a25fcd0e8168970cb7e4b1920aeae2 |
11-Jul-2011 |
Mindy Pereira <mindyp@google.com> |
Merge "Print debug info for reverse lookup."
|
| 4f36b72bcfe3e9f9b9d99a5872de0522f20c7a6c |
11-Jul-2011 |
Mindy Pereira <mindyp@google.com> |
Print debug info for reverse lookup.
Change-Id: I8102bbe4d63e0c87e0603966b58d5773b20b4302
hips/src/com/android/ex/chips/RecipientAlternatesAdapter.java
|
| 1d078727489f4d4e1967fcc65edd6da6d75c0db1 |
10-Jul-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| 58a4eff89a2493d6e310538fbc1579d7284c7bd9 |
08-Jul-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| bbf141b605f92729864984229e6e1062d9a462be |
08-Jul-2011 |
Mindy Pereira <mindyp@google.com> |
Never set a span if we dont have matching text.
Fixes b/5004459 java.lang.IndexOutOfBoundsException: setSpan (-1 ... 3) starts before 0
Change-Id: Icc60924cfab8393ff3da2116e8a5eb6130aa8261
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 1be5b8868d39f293361298fb641cf564b2d5e995 |
07-Jul-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| 91b05eafd38f6fbbf87440c6b96c7d4b434ab3db |
07-Jul-2011 |
Mark Brophy <mbrophy@google.com> |
Add the new global-search field to android-common.
For unbundled apps which don't build against ICS yet,
but need to support this feature.
Change-Id: I3aca93d007ae05e2c59dc8e0613e761ec52ecdea
ommon/java/com/android/common/Search.java
|
| c5ccc99a704e13c8fdd1eb2242598cd5956234d4 |
07-Jul-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| b1dd0ac0f11ff3d6352f67311f14aa95185d224b |
07-Jul-2011 |
Mindy Pereira <mindyp@google.com> |
Make sure we leave a space when processing appended recipients.
Also, the bug I was working around for aligning the alternates dropdown
doesnt appear after this fix, so removed the workaround.
Change-Id: I680e39bd9d1a43d559225d4665876a82d6ced7ce
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 8b308552260807ba6611a4ab3bb23f0211608767 |
07-Jul-2011 |
Mindy Pereira <mindyp@google.com> |
Fix extra spaces that had been getting added when the user selectd/unselected a chip.
This also prevents us from having to make an extra string and replace it
as all we were REALLY doing was replacng the span.
Also fixes the issue where we were leaving an extra space after deleting
a chip by pressing the X. This was an off by 1 error.
Change-Id: I9d2dbe4647119a64857766ee9b45207c6d365497
hips/src/com/android/ex/chips/RecipientChip.java
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| c6e6141037bf299cabf4a1ba6b3664f5bc426bd0 |
06-Jul-2011 |
Mindy Pereira <mindyp@google.com> |
Scroll before showing the alternates list.
This allows us to have the alternates list properly positioned
AND prevents the dialog from appearing ABOVE the contact.
Change-Id: I78fd1d6ef6b08a1274e7299439b8679f43d1ba86
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 77056d7532cd26e869964a52456ef18c96f6cbd7 |
28-Jun-2011 |
Mindy Pereira <mindyp@google.com> |
Do reverse lookups on pre-appended recipient chips.
Change-Id: I338a07f89264606a58942520791f39908fedbedb
hips/src/com/android/ex/chips/RecipientAlternatesAdapter.java
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| d1781f37e353d7b2d0201fee55c7f05ae7735772 |
04-Jul-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| 0fc929e5fb977fe028d7db04a3ad57e74f42e654 |
01-Jul-2011 |
Mindy Pereira <mindyp@google.com> |
Always show the more chip for a collapsed recipient view if there are too many recipients.
Previously, this would not get shrunk until the user focused/ unfocusd
the field. Now, if the field doesn't have focus, it starts out
in the shrunk mode.
Also, when appending a contact, properly tokenizes the contact
so that we show just the email address.
Change-Id: I085ed00dc94b38d22e871d7e80589e5b2d74f98f
hips/src/com/android/ex/chips/RecipientAlternatesAdapter.java
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 416e1307e57a36650bd15a06bb0ac2915a195a2e |
01-Jul-2011 |
Mindy Pereira <mindyp@google.com> |
Fix the offset of the popup window.
If I use the view as the anchor and the vertical offset, then
the popup appears correctly even after a scroll.
I believe this will also take care of the cases where the popup
had been appearing above chips, as the view will be scrolled
to fit the popup if possible.
Fixes Bug:4723677 chips: sometimes popup appears ABOVE the chips field
Change-Id: I976be8e4e06ff44a093f8a93c65a63d433b1e774
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| af82e06b81af7bbc5f5c110f90967b67ddb59501 |
29-Jun-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| 4590aec41cecb38a8bed594d11c861924767d1e1 |
28-Jun-2011 |
Mindy Pereira <mindyp@google.com> |
Merge "Move contact picture to the right of the chip where the delete icon shows."
|
| 84566923f447a5c0dc85498dbb6e06eecd6a0946 |
28-Jun-2011 |
Mindy Pereira <mindyp@google.com> |
Show the contact photo to the right of the text.
Change-Id: Iac3e8cc515b32b2eeb899c43e660a1a4aee55731
hips/res/layout/chips_alternate_item.xml
hips/res/layout/chips_recipient_dropdown_item.xml
|
| 379c70a85c105ed2b003f0525fab2914eb79d1d1 |
28-Jun-2011 |
Mindy Pereira <mindyp@google.com> |
Move contact picture to the right of the chip where the delete icon shows.
Change-Id: I0d74965c98f96384a7c0b01d4a9a05b34524301e
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 76ebe80e9fc58b31452d1a0724dd88d420a5b580 |
28-Jun-2011 |
Mindy Pereira <mindyp@google.com> |
If the selection happens to be at zero, dont look for the char before.
Fixes Bug:4969660 java.lang.IndexOutOfBoundsException: charAt: -1 < 0
Change-Id: Ie307b3088be32e2cf9afdfdcf1c0106046dbc805
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| b810bb222f45323d9945cb59930f3476b92bcfca |
27-Jun-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| c0eff46d5c8ed061a7e103b94cedada6fd71b1b5 |
25-Jun-2011 |
Mindy Pereira <mindyp@google.com> |
make sure there is a position after the comma before moving to it.
Fixes Bug:4948080 ANR when tried to attach a picture in Gmail Compose
Change-Id: Idf13eec6bf36cba14fae2c633de98049b04c3f8f
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| c0161b30325d2a8abd82a28a38164d413703add6 |
27-Jun-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| c9a3ccb0d1b6158025bb4a1add944a37128f73bd |
24-Jun-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| 27c04d46306f91e1ddd2a935b983671004e44fdf |
24-Jun-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| dd898627b7cd0d4dac98a8cbbd3bfffda0456a7a |
24-Jun-2011 |
Mindy Pereira <mindyp@google.com> |
When recipients are appended, take them as is without ANY parsing of tokens.
Change-Id: I7ecc16cc032e7a6f4809ba1a323f7e445b8f74fd
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| fb91a5f9d871e06344dac005f9cc51a3fd4f9701 |
24-Jun-2011 |
Mindy Pereira <mindyp@google.com> |
Make sure we dont use textwatchers or commit chips incorrectly.
1) Never use textwatchers when there are any pending chips. These
may be because there are recipients that were hidden when the more
chip was shown, or because we are parsing appended recipients.
2) turn off item clicks for alternates before we send the dismiss event,
since we dont dismiss immediately and we want to be sure the user cannot
click 2 recipients if the device is running slowly.
Change-Id: I53ae04a0f7c23f4ef7396ea203d8d1bb0a1b6e34
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 7a4d7e4b70201ccbc321584f84b5ac29005a3bb1 |
24-Jun-2011 |
Mindy Pereira <mindyp@google.com> |
If the user chooses a contact with an invalid address, make this an editable address chip.
Per new spec:
Don't display alternates, always treat as an invalid email to enable editing.
When the user is in edit mode then can back up which displays suggestions again
Change-Id: Ie59101940eaf8f306d482c3ae8a5c04d5aa69560
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 054b3caa7d695ff5bd6cebfb79067e731f334934 |
24-Jun-2011 |
Mindy Pereira <mindyp@google.com> |
If the user put a commit char in the middle of text, make a chip up to the commit char.
Ex:
1234567
I insert a comma between 3 and 4
123 becomes a chip
4567 remains as text and the cursor goes to the end of it
Change-Id: Ibd4f54b26fb4ae6c6f267232c03f76e0850e4d7e
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| a501d9f79683be8d82c348ae50c97e2655d79cce |
24-Jun-2011 |
Mindy Pereira <mindyp@google.com> |
When recipients are appended, take them as is without ANY parsing of tokens.
Change-Id: I7ecc16cc032e7a6f4809ba1a323f7e445b8f74fd
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 368f569ffda5dc5fb85ee1eebc023759a46e31c8 |
24-Jun-2011 |
Mindy Pereira <mindyp@google.com> |
Make sure we dont use textwatchers or commit chips incorrectly.
1) Never use textwatchers when there are any pending chips. These
may be because there are recipients that were hidden when the more
chip was shown, or because we are parsing appended recipients.
2) turn off item clicks for alternates before we send the dismiss event,
since we dont dismiss immediately and we want to be sure the user cannot
click 2 recipients if the device is running slowly.
Change-Id: I53ae04a0f7c23f4ef7396ea203d8d1bb0a1b6e34
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 8dd451f8c29c48f51116f955fe51ef600bd3c378 |
23-Jun-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| e0bf819fff34b7678dd336e4fd010f04bb343eea |
21-Jun-2011 |
Mindy Pereira <mindyp@google.com> |
Reenable space handling for chips.
The issue was that I was cutting off spaces too soon when
removing commit chars.
Seperated commit via enter/tab/lost focus
from editing and from enter via a character
Since I can't watch for key events, I have to have a textwatcher
This makes sure the textwatcher is not instantied until AFTEr all
reply/reply all recipients have been parsed and created.
Change-Id: Ib9f2228595a77c96b1e72f38c0269c4ad0c92033
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 9763bf1b76a948f973c8aea0172c6556f4c1ff88 |
22-Jun-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| 348213cfe650d4110214c3fd653bfccc501cc69d |
22-Jun-2011 |
Mindy Pereira <mindyp@google.com> |
Merge "Clearselectedchip and unselectchip should not call each other."
|
| 25b611d9deac1827bda847c388da1af0160986d7 |
21-Jun-2011 |
Mindy Pereira <mindyp@google.com> |
Fix the left offset of the alternates popup.
Change-Id: I9029fd370e95cbd7ab7a34f200b87e2b873482e3
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| dc5143e5d1eb107937e85654ef2fc79d8554752b |
21-Jun-2011 |
Mindy Pereira <mindyp@google.com> |
Remove space handling for now.
This needs to be run only on NEWLY added recipients, notappended ones.
Change-Id: I2754528ae660928d75b6a1e097976a151995944d
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| c57ee19c891696a126fe8b6dec74aa4f6a00c6a5 |
21-Jun-2011 |
Mindy Pereira <mindyp@google.com> |
Clearselectedchip and unselectchip should not call each other.
Fixes Bug:4768416 StackOverflowError when clicking on chips
Change-Id: I8151cee90390df834eef87f60af96da9b910daca
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| ed58ebd3f54ae5e73129f7f12c8342f177ed1fc3 |
21-Jun-2011 |
Erik <epastern@google.com> |
Don't start the filter until we have an adapter
This is to prevent a crash if an adapter isn't set during creation.
Change-Id: I328659889b42f9c02fdde2a1074916f6b4fed354
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 3bb285bed15583819aa01efd127ee095b180f613 |
21-Jun-2011 |
Mindy Pereira <mindyp@google.com> |
Remove space handling for now.
This needs to be run only on NEWLY added recipients, notappended ones.
Change-Id: I2754528ae660928d75b6a1e097976a151995944d
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| db442b610cd7bbc032864dba8b55146902f726d0 |
21-Jun-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| dfa1d391014fac824be4ba48582f160ffcac7303 |
20-Jun-2011 |
Mindy Pereira <mindyp@google.com> |
Follow defined logic for committing when the user presses space.
If valid email address commit the chip
Fixes Bug:4725531 chips: implement logic to handle space key
Also simplifies the logic for editing in the middle of a chip
(we don't need the submitText flag)
Change-Id: Id4af8d5840f75bf7bb4066e481761a885536dd20
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| cb041c294cd3fe41062f1b76d3bfc7d1cb1981d9 |
20-Jun-2011 |
Mindy Pereira <mindyp@google.com> |
Force services to be launched as soon as possible when chips are instantiated.
This will redue the pause before seeing result from the first query.
Bug:4691146 butter - warm up contacts autocomplete before user types on compose activity
Change-Id: I6f07284f44824dfe6f25fec27cdd300d9adf7da1
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| e02887e8f6a84d819287dd05ec6e9452499adb24 |
20-Jun-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| b3f8574ad18184f5a9392fc7773863f59f9f5192 |
18-Jun-2011 |
Mindy Pereira <mindyp@google.com> |
Fix rotation crash.
On orientation changed or activity paused/ restarted, the window
and context were not being properly refreshed for this widget.
This led to crashes when the user tried to show the alternates popup.
The reason the context/ window were not being refreshed
is that references were being held by the chips to one or both of these.
The chips were also retaining references to the spannable, which caused
issues in that the spannable was not being updated in the chips, and
after a rotation, the chip would no longer be able to find where
it had been attached to the spannable. To fix all these issus,
I made the RecipientChip class a seperate, simple data holding
class and allowed the RecipientEditTExtview to do the heavy lifting
as it contains the correct contextual information. This has
solved the crashes I had been seeing.
Change-Id: I4123f7bb2a5195c084efa602c5409d87596275d7
hips/src/com/android/ex/chips/RecipientChip.java
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| e98f079e157d2872100174ba67beef8ebbc0cec0 |
17-Jun-2011 |
Mindy Pereira <mindyp@google.com> |
When the user starts editing mid address and submit, always submit all the text.
Previously, when the user hit enter in the middle
of text they were editing, it would divide at the cursor and create
a chip to the left and leave text on the right. This fixes that issue.
Change-Id: If9fd92e4d07008e86351de85de0115d51aca204b
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 19eb411905d411c029b0241ca690bb9313a02278 |
17-Jun-2011 |
Mindy Pereira <mindyp@google.com> |
Fix race condition.
Crash was reported where the checked item position had yet to be
set when the list tried to get it. This uses a listener to make sure
that the checked item isnt set in the list until the adapter has it.
Change-Id: I2b5170ab9440bbb0a69989657313b1a4b6d653cd
hips/src/com/android/ex/chips/RecipientAlternatesAdapter.java
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| e24cb318a0e07fce3db99e1ef6234a196f256bef |
17-Jun-2011 |
Mindy Pereira <mindyp@google.com> |
If there are no chips to chipify and the user hits enter, focus the next view.
Per UX and user studies.
For tab, commit and then focus the next view.
Change-Id: I9f226cb82191b4866b3ddd1c2cc4f1ae185e65e3
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 3656f7e97c58dc8443132d2d8297629b6a04cce7 |
17-Jun-2011 |
Mindy Pereira <mindyp@google.com> |
Fix race condition.
Crash was reported where the checked item position had yet to be
set when the list tried to get it. This uses a listener to make sure
that the checked item isnt set in the list until the adapter has it.
Change-Id: I2b5170ab9440bbb0a69989657313b1a4b6d653cd
hips/src/com/android/ex/chips/RecipientAlternatesAdapter.java
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 5519208c37aea65dab7edf555ab27844e12cdd71 |
17-Jun-2011 |
Mindy Pereira <mindyp@google.com> |
Every chip should take into account bottom padding for the alternates popup.
Every line will be affected by the padding, not just the bottom.
Fixes the offset of the alternates popup from the bottom of the chip
and prevents it from overlapping the delete icon at all.
Change-Id: I3c45255ffa1252b6d7ebcf95663b35f7ca952190
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 1585be84a5d70550b8f2871899dab3528a51fae5 |
16-Jun-2011 |
Mindy Pereira <mindyp@google.com> |
Fixed bug where appended chips might be added twice.
Since email focuses the compose field instead of the to field
the to field received an immediate unfocus event, which caused any
defaults in the field to be committed. This caused double commits
of a single contact as a chip. This makes sure we dont commit
a pending chip in onSizeChanged that has already been handled.
Integrating into Email revealed this bug.
Change-Id: I65f0f38f1dabe0b1434f0d2e4bcd2ff9a579e621
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 77db539da02cf42742330f1969fd94bb94a61db8 |
16-Jun-2011 |
Mindy Pereira <mindyp@google.com> |
Visual tweaks requested by UX.
1) Text on selected chips should be white
2) new delete asset
3) new background selected asset
4) align the alternates popup with the left of the
text field regardless of the position of the chip
5) dont get the position to put the popup at until the user
has tapped it; we cant cache it as other chips changing may have
moved this chip to a different line.
Also cleaned out unused assets.
Change-Id: I7cff1b945ca7a0c7e04430c66c5976de2dee468d
hips/res/drawable-hdpi/alternate_list_background.png
hips/res/drawable-hdpi/check_selected.9.png
hips/res/drawable-hdpi/chip_delete.png
hips/res/drawable-mdpi/alternate_list_background.png
hips/res/drawable-mdpi/check_selected.9.png
hips/res/drawable-mdpi/chip_delete.png
hips/res/drawable/list_item_background.xml
hips/res/layout/chips_alternate_selected_item.xml
hips/res/values/dimen.xml
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 05522aeae1948f776e618f69d34d4a5e48a0471c |
15-Jun-2011 |
Mindy Pereira <mindyp@google.com> |
Make semi colon and comma commit default contact chips.
Change-Id: I372275746d7c903f17268df808ec8896ea0fa38b
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| e156c9328568d91b5635973529bb044debfbcb87 |
15-Jun-2011 |
Daisuke Miyakawa <dmiyakawa@google.com> |
Merge "Pass query parameters for primary account."
|
| 74e701b8da11fb1840169945b4b494f28d44ca79 |
15-Jun-2011 |
Mindy Pereira <mindyp@google.com> |
When user has a focused chip and starts typing, unfocus it.
Brings back that previously removed change in a better way.
Change-Id: Ibd5d3f17b918e36c01836aa3d01472e59c92f03e
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 4f5f0328efbd5f72e30adf08ba7d89a66b4659ce |
15-Jun-2011 |
Mindy Pereira <mindyp@google.com> |
Fix issue where extra commas were inserted.
Some applications provide recipients of the form:
append(address);
append(",")
and some provide:
append(address+",");
this makes sure we cover both cases.
Change-Id: I302d562783005466d1f06f17069e1af36ddf0584
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 1426d714da911130b643f7039590eceaa6420aa7 |
15-Jun-2011 |
Mindy Pereira <mindyp@google.com> |
Remove deprecated method.
Change-Id: I1fbd80bb0ae496b27da56e0abc330b80a057b8c2
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| d79e1a0e1a12944c6b9bae1dcfd5c602693281c0 |
14-Jun-2011 |
Mindy Pereira <mindyp@google.com> |
Deprecate one of the setChipDimen methods.
2 stage. I will update Gmail in a CL and then remove the deprecated method.
Change-Id: I06078c4a71022176f9097360a98eff269ce334db
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| c72429f17e12ec39e61a7efdb7312b7f5d8a5cbc |
10-Jun-2011 |
Mindy Pereira <mindyp@google.com> |
Create chips when text is appended.
When text is appended to the multiautocompletetextfield,
we need to make sure we make chips of the added text.
Since in many cases it will be added before the view
is measured, we may need to wait for onSizeChanged to get
called. This stores chip info for later use in creating chips
once we can measure the width / height of the view.
Change-Id: Ifc9b8bdf089fb0293bb76ea9cd7aeacfc3f9da87
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 156467329e276c9bc90945bea916ce3ac4849574 |
14-Jun-2011 |
Mindy Pereira <mindyp@google.com> |
Delay closing the alternates popup when the user selects an alternate.
Per UX, this gives the user a better idea of what has just occured.
Using temporary assets.
Change-Id: Ied49f899d7999356cc01a672ecb22f492901d55c
hips/list_selector_pressed_holo_dark.9.png
hips/res/drawable-hdpi/alternate_list_background.png
hips/res/drawable-hdpi/chip_checkmark.png
hips/res/drawable-mdpi/alternate_list_background.png
hips/res/drawable/list_item_background.xml
hips/res/layout/chips_alternate_item.xml
hips/src/com/android/ex/chips/RecipientAlternatesAdapter.java
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 4f7412c084ad344e94a320b51270ac6480a47a84 |
10-Jun-2011 |
Mindy Pereira <mindyp@google.com> |
Remve deprecated version of setChipDimensions function.
Change-Id: I8988e3fc2120ab720ff93d31f07db22837f449e3
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 045e80b59ef5e9a709b6e5843d2301a02e0872f2 |
10-Jun-2011 |
Mindy Pereira <mindyp@google.com> |
Added invalid chips, fixed comments.
Add an invalid background for chips that cannot be validated.
If there is a validator, and a chip is invalid, set it to a red
background for now.
Note: I left the old method for setChipDimensions so that
I don't break Gmail.
Updated comments in the code to be clearer.
Change-Id: I01553cf0c3b3a6c7c59da5016d32be364535f7f2
hips/res/drawable/chip_background_invalid.xml
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 8684974e4befb4c9dcc21c995c4ff3af7103ab10 |
10-Jun-2011 |
Mindy Pereira <mindyp@google.com> |
Commented most of the public methods of the RecipientEditTextView.
Also, when the user taps another chip and there is text leftover
at the end, complete the text with the default chip behavior.
Change-Id: I6d0f16ed67efad50bc890e7ed5461857e6126675
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| a7cb073e0a398c64248837226650ac05e03936a4 |
10-Jun-2011 |
Daisuke Miyakawa <dmiyakawa@google.com> |
Merge "Introduce utility library for sending usage feedback."
|
| 2fd97117b7a325f256279a9c7ea02b48b1e57632 |
01-Jun-2011 |
Daisuke Miyakawa <dmiyakawa@google.com> |
Introduce utility library for sending usage feedback.
It allows each app to conveniently send data usage feedback
to ContactsProvider, which includes
TIMES_CONTACTED/LAST_TIME_CONTACTED existing before ICS and
DataUsageFeedback stuff introduced in ICS.
This library checks API version and update relevant data
appropriately, so each application doesn't need to take care
of details of API (and possible API change in ICS)
TODO:
- need test for this.
Must be after I602c0b83afca674904946f59bbdfc4dca07d46e4
Bug: 4371572
Change-Id: Id84ef81392c48d8c59eb89e0407eec0c592f3b31
ommon/java/com/android/common/contacts/DataUsageStatUpdater.java
|
| 35654303c707e4b4926263c18090c58dca06f3a2 |
10-Jun-2011 |
Mindy Pereira <mindyp@google.com> |
Add copyright to file.
Change-Id: I1d6efeea9f960baa05e0c65dd7a81e3461d456d1
hips/src/com/android/ex/chips/AccountSpecificAdapter.java
hips/src/com/android/ex/chips/AccountSpecifier.java
hips/src/com/android/ex/chips/BaseRecipientAdapter.java
|
| 7a424984849627457aa27ac19c0d23cbe0887c85 |
09-Jun-2011 |
Mindy Pereira <mindyp@google.com> |
Small changes to make this more easily integrated into apps.
1) created interface for old adapter and new adapter
to implement so they can be used interchangeable
2) did null checks for chips when getting data/ contacdt ids
Change-Id: I7f47230c5cf35426b73b477f374641b271455411
hips/src/com/android/ex/chips/AccountSpecificAdapter.java
hips/src/com/android/ex/chips/BaseRecipientAdapter.java
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 83e4ae382ffbec673b16c85c35e3cfe19ada98dc |
09-Jun-2011 |
Mindy Pereira <mindyp@google.com> |
Remove mRecipients cache and put in error protections.
Stopped tracking recipients in mRecipients so that I didn't have
to have another cache of recipients to keep up to date (this is cleaner)
Also where its possible that there would have been a crash, i have now
added log.e handling so that we can go to droidfood and get logs
telling us what happened.
Change-Id: I133fbe9bf837a6b93af860147fd1923ee8191a4c
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| fab0afdc6742dcba55cfbe802cd143434d48f413 |
08-Jun-2011 |
Mindy Pereira <mindyp@google.com> |
Make sure select/unselect follow the same pattern for making chips.
Change-Id: I9aa08ca535e80f7c41a324aa445d5dabed58fafa
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 90081ee88c7eb216ea22f426aa6856e310a867e1 |
08-Jun-2011 |
Mindy Pereira <mindyp@google.com> |
Make sure even second level addresses have a photo uri.
When a second level item is chosen, we still want to show
the associated contact photo. We need to set the uri but can get the
photo on the fly later.
Change-Id: Idc9e02452ad5e1d6291776a94a6f3c3c6ada14b4
hips/src/com/android/ex/chips/BaseRecipientAdapter.java
hips/src/com/android/ex/chips/RecipientEditTextView.java
hips/src/com/android/ex/chips/RecipientEntry.java
|
| fcdaf46366afd32e8b35406216dbb3c6961793aa |
08-Jun-2011 |
Mindy Pereira <mindyp@google.com> |
Remove tricksy workaround.
Since I was unable to get key events in the text field, this was
the suggested workaround, but it is causing many issues, so removing
it.
Change-Id: I62547953b59c735e426b330fe946ca2f1b8a4773
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| e6f595ab1f8409f23978baae564ad3cb9e0b5f41 |
07-Jun-2011 |
Mindy Pereira <mindyp@google.com> |
Asset updates from Ux.
Larger chips, better delete asset, better fonts.
Change-Id: I1d706d5b56bd496e51c772e65d3456d0f3239a43
hips/res/drawable-hdpi/chip_delete.png
hips/res/drawable-mdpi/chip_delete.png
hips/res/drawable/chip_background_normal.xml
hips/res/drawable/chip_background_selected.xml
hips/res/values/attrs.xml
hips/res/values/dimen.xml
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 4ed0433e005c8a39355ab270e0dd869b481df21d |
07-Jun-2011 |
Daisuke Miyakawa <dmiyakawa@google.com> |
Merge "Clear text when address isn't available."
|
| 9024e5c88fde2f878eea4bca6923ad57a3f0cfe0 |
07-Jun-2011 |
Mindy Pereira <mindyp@google.com> |
Fix issue where deleting did not allow the user to start typing again.
Also dont draw a contact photo for any typed in recipient.
Per UX, if the email address and display name are the same,
make this a chip that is editable.
Also dont store the start/ end positions for the chip
as they may change.
Change-Id: I05a2543d92564c2ec275d0d882cf4a766bad6f92
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 4690ffedeed9a067ecef01e26107b58173b3712a |
07-Jun-2011 |
Daisuke Miyakawa <dmiyakawa@google.com> |
Clear text when address isn't available.
Change-Id: I06bfd212e2c691ef1d06cc7ce3e67bccd39e3cec
hips/src/com/android/ex/chips/BaseRecipientAdapter.java
|
| 95d81e62a0abb2f81624796f1fca9665cdb1a79e |
07-Jun-2011 |
Mindy Pereira <mindyp@google.com> |
On back key, clear any selected chips.
Change-Id: I764b312f3ffd2ba74be65b8f6bad0cc15bf2e8df
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 994417d0972ed3beec236172332bba193c01d602 |
07-Jun-2011 |
Mindy Pereira <mindyp@google.com> |
Remove unneeded/ unused Rfc822ChipsTokenizer.
Change-Id: I8efa2f06fb8a3afb502b50f2f842699c72d7fb96
hips/src/com/android/ex/chips/Rfc822ChipTokenizer.java
|
| 4e1f6098a731be3d0be1f9e02a1fa2677e4de187 |
06-Jun-2011 |
Mindy Pereira <mindyp@google.com> |
When the recipientedittextfield is not focused, shrink it.
When focus is list, the field should only display X recipient chips,
where X is currently 2 lines worth with X+ more text at the end.
Change-Id: Iea73d5d3682e4b8cd3adf4a671271cca4ab3c1f2
hips/res/values/attrs.xml
hips/res/values/strings.xml
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| c55843a69549bcac0380211335530a99ba677049 |
03-Jun-2011 |
Mindy Pereira <mindyp@google.com> |
When the field loses focus, commit the default chip.
If there were any filterable results, this is the first entry
provided by the adapter.
If not, this is whatever the user was typing in.
Change-Id: I966382dbe38adb20d4123b53443b0fd8d8cf9c89
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 1e9f1deb091a9552d746a69685e59a2bf48b6971 |
03-Jun-2011 |
Mindy Pereira <mindyp@google.com> |
Show the contact picture in an unselected chip.
Change-Id: Id9341b0365e40144de0ac74438395121fda30c01
hips/res/drawable/chip_background_normal.xml
hips/res/drawable/chip_background_selected.xml
hips/res/values/dimen.xml
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| d9b57273c1f5c3bcd94e662136446cd6fd465ebc |
03-Jun-2011 |
Mindy Pereira <mindyp@google.com> |
Add handling for focus changed.
When the recipientedittextview loses focus:
1) unselect any selected chips (do not commit)
When it gains focus:
1) show all the chips
2) place the cursor at the end
When a chip gains focus:
and its a real contact: hide the cursor
and its not a real contact: show the cursor
Never show "no suggestions" popup
Change-Id: Id104c62c47bc2f97bcf72514e39760205596eefd
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 1a8bbbf9aa203287f53736a680f96b16d5c878a7 |
03-Jun-2011 |
Mindy Pereira <mindyp@google.com> |
De-select on tap. Also give min width to a chip.
If the user clicks a selected chip, unselect it.
Make sure all chips have a minimum width (right now
2X the width of the delete icon) so that there is
always a tappable area regardless of how short the name is.
Also make sure the bounds of the chip do not change in selected
vs unselected mode.
Change-Id: I8bc2302cc7602c62eac727cf77306aac37c27ed4
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| c661043a83b7f641515d3044532f1301c202f339 |
03-Jun-2011 |
Mindy Pereira <mindyp@google.com> |
Show a checkmark on the default selected item.
This is a temporary asset.
Change-Id: Idd52bb3415fd860c59600938696b9fc2d996dc06
hips/res/drawable-hdpi/chip_checkmark.png
hips/res/drawable-mdpi/chip_checkmark.png
hips/res/layout/chips_alternate_selected_item.xml
|
| de408b64eea4811d7e7abb2f7e719437c9ec2bc3 |
02-Jun-2011 |
Mindy Pereira <mindyp@google.com> |
Rename delete.png to chip_delete.png
Change-Id: I1ec286de5395336c34e2dea7978147311917f4b5
hips/res/drawable-hdpi/chip_delete.png
hips/res/drawable-hdpi/delete.png
hips/res/drawable-mdpi/chip_delete.png
hips/res/drawable-mdpi/delete.png
|
| 36d720eb2b7a8d3466d221944a00b8bae7de8e9c |
02-Jun-2011 |
Mindy Pereira <mindyp@google.com> |
If a chip is selected, hide the cursor.
This change got lost when I was removing the wrapper class.
Change-Id: I787f5cca6ba6d2226b383f07418e24ccbfbde122
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 55bb2833b29945c08b809408ff94ddf7703e911a |
02-Jun-2011 |
Mindy Pereira <mindyp@google.com> |
Fix a crash in the removeChip logic. Update alternates dropdown.
There was a crash that could happen if you deleted the first item.
The change in RecipientEditTextView to check that toDelete >= 0 fixes
this.
Also, made the icon and the recipient display name show for the topmost
entry only.
Change-Id: I56b8768c8ead282e2477f91a130bf8cc6fb72b15
hips/res/layout/chips_alternate_item.xml
hips/res/layout/chips_alternate_selected_item.xml
hips/src/com/android/ex/chips/RecipientAlternatesAdapter.java
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| c4ad472c11324428ac9c75bcf7d52263ff4699f1 |
02-Jun-2011 |
Mindy Pereira <mindyp@google.com> |
Make the delete target EXTREMELY large and tweak tapping algorithm
Experimenting with a really large tap target for the delete icon.
Also tweaked the search algorithm to start at the beginning of
the spans when looking for a chip.
Also was able to get rid of the handler and delayed focus since
the code now watches for selection changes and always keeps
the cursor just past the last chip.
Change-Id: I105a7cb72ceb77f4f21b662a978e819fba3d9875
hips/res/drawable-hdpi/delete.png
hips/res/drawable-mdpi/delete.png
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 59a4ac58f8cabdc687c27d2c29ca0fbdb2112677 |
02-Jun-2011 |
Mindy Pereira <mindyp@google.com> |
Merge "Improvement to tap detection for the delete button."
|
| 4fef2782b06043dbf73c896c4d1962be0b8dcd50 |
02-Jun-2011 |
Mindy Pereira <mindyp@google.com> |
Improvement to tap detection for the delete button.
This improvement works as follows:
1) If the user has tapped near the end of the text
and there is some text near where they tapped that is
not a chip, don't send the tap to the chip
and there is no text near where they tapped, send
the tap to the chip
Change-Id: Ifb93ec716d4a9ff1b9dcc2548465280c39d834cf
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| c3e9ed6223814e5901d1ae987154eb88c4237f44 |
02-Jun-2011 |
Mindy Pereira <mindyp@google.com> |
Don't allow the user to drag the cursor between chips.
This prevents the user from dragging the cursor between chips.
Whenever the cursor is active, if the user tries to drag it over
chips, it will be replaced at the end of the chips. This does not
prevent the user from moving within text they are editing.
Change-Id: I89500b64f1332751a295dd46b103540621435376
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| c7ea4602c84a8fed20488337b8d1a00d8a205f6a |
02-Jun-2011 |
Mindy Pereira <mindyp@google.com> |
Remove wrapper.
getText now also returns the correct comma seperated values.
Change-Id: I109f80df507cc377c53615e7f19c21f9b3fb47dd
hips/src/com/android/ex/chips/ChipsUtil.java
hips/src/com/android/ex/chips/RecipientEditTextView.java
hips/src/com/android/ex/chips/RecipientEditTextViewInner.java
|
| 5905985ea633d5395d2145bfbae033f6855d6c8c |
02-Jun-2011 |
Mindy Pereira <mindyp@google.com> |
Hide the cursor when the user has selected a chip.
Also fix issue where the correct span was not being removed.
Unselect the chip AFTER it has been swapped for a new chip or an empty span.
Change-Id: I312492ff1fbb60cb416c3ba703e7f7c76247d75e
hips/src/com/android/ex/chips/RecipientEditTextViewInner.java
|
| 3201fa0417926025a6ef79d6ccd359f2ab3c45ae |
01-Jun-2011 |
Mindy Pereira <mindyp@google.com> |
When deleting, make sure we also remove associated extraneous spaces.
A Chip also has trailing spaces. When we delete a chip, make sure
to remove the associated spaces so that everything flows together correctly
and there are no extra spaces.
Change-Id: I87cb3fe0bf6f947549f1da3e617e4c92ed332e28
hips/src/com/android/ex/chips/RecipientEditTextViewInner.java
|
| b5e6f03dee6e11d51a7d8988f427e9ca4b5b1677 |
01-Jun-2011 |
Mindy Pereira <mindyp@google.com> |
Make the delete tappable region even smaller.
Taps that are CLEARLY beyond the end of the visible text
should not cause a chip to get deleted.
Change-Id: I71d810c5a9969b0bba046a382c8c45755db35aa1
hips/src/com/android/ex/chips/RecipientEditTextViewInner.java
|
| 5f2cc770801133c2db389ebe108063427d1cf6aa |
01-Jun-2011 |
Mindy Pereira <mindyp@google.com> |
Make RecipientEditTextViewInner package private.
Also add license and make EmailQuery values package private.
Change-Id: I366ca01ac54f04fbc999377be59dbaa139307550
hips/src/com/android/ex/chips/BaseRecipientAdapter.java
hips/src/com/android/ex/chips/RecipientAlternatesAdapter.java
hips/src/com/android/ex/chips/RecipientEditTextViewInner.java
|
| b29315d91230ded8fc0682f943e379a020f36dac |
01-Jun-2011 |
Mindy Pereira <mindyp@google.com> |
Fix filtering bug and reduce area that causes delete of chip.
The bug was: when the user backspaced from the end of the multiautocompletefield
to a chip, the view would bring up a popup that filtered against hte contents
of the chip. This fixes that by specifically not filtering on chip contents.
Also, dont allow taps past the end of a chip to delete the chip.
Change-Id: Idbb41756c9efd544846802ddad8c67545b8ade1f
hips/src/com/android/ex/chips/RecipientEditTextViewInner.java
|
| 699c1e37a1bf26daab34f2117a14c6e883636077 |
01-Jun-2011 |
Mindy Pereira <mindyp@google.com> |
Show alternate addresses when the user taps on a contact.
Change-Id: I9a88dd1612b98587e560c1e50030e36a28e30db9
hips/res/layout/chips_alternate_item.xml
hips/res/layout/chips_alternate_selected_item.xml
hips/src/com/android/ex/chips/BaseRecipientAdapter.java
hips/src/com/android/ex/chips/RecipientAlternatesAdapter.java
hips/src/com/android/ex/chips/RecipientEditTextView.java
hips/src/com/android/ex/chips/RecipientEditTextViewInner.java
|
| 5e6306039bca3ad3897182a8d8bf45abe80680e5 |
01-Jun-2011 |
Mindy Pereira <mindyp@google.com> |
Create wrapper for RecipientEditTextView.
Hide that this isn;t just a normal MultiAutoCompleteTextView
by wrapping getRecipients in getText
Change-Id: Ib11777b4fbf55bfb9aafb1cda18fd1ed246895ad
hips/src/com/android/ex/chips/ChipsUtil.java
hips/src/com/android/ex/chips/RecipientEditTextView.java
hips/src/com/android/ex/chips/RecipientEditTextViewInner.java
|
| 6594c740b78d9d9aa97489bb3b307fa94c2fc905 |
01-Jun-2011 |
Daisuke Miyakawa <dmiyakawa@google.com> |
Merge "Use long for ids"
|
| 9376c61306efb52a098c140ea503058152e3b0dd |
01-Jun-2011 |
Mindy Pereira <mindyp@google.com> |
Fix issues with deleting.
The chip span does not encompass the delete token, so we need to
check for taps as well.
Change-Id: I094cd3df04b8d51a54cd9fc1717c515383b08870
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 65b8c0327b00beda9309c7b7c116013d03b06d90 |
01-Jun-2011 |
Daisuke Miyakawa <dmiyakawa@google.com> |
Use long for ids
Also optimize update method
Bug: 4443828
Change-Id: Ie51a3b40e0852cfab8f81c2a56cbc13f5072ad6c
hips/src/com/android/ex/chips/BaseRecipientAdapter.java
hips/src/com/android/ex/chips/ChipsUtil.java
hips/src/com/android/ex/chips/RecipientEditTextView.java
hips/src/com/android/ex/chips/RecipientEntry.java
|
| b5ebb8916a1bb178062a0ccb59e80de27ec1bb2d |
01-Jun-2011 |
Daisuke Miyakawa <dmiyakawa@google.com> |
Add data Id support and account support.
Also add utility methods for chips UI.
Bug: 4371572
Change-Id: Iec086c06ac844ca19c776f82b127a48804bab8e6
hips/src/com/android/ex/chips/BaseRecipientAdapter.java
hips/src/com/android/ex/chips/ChipsUtil.java
hips/src/com/android/ex/chips/RecipientEditTextView.java
hips/src/com/android/ex/chips/RecipientEntry.java
|
| 0f93fba1c7da8cb2d209e5e37831600c3b86852c |
01-Jun-2011 |
Mindy Pereira <mindyp@google.com> |
Add getRecipients
Method gives the calling application a plain editable containing
all of the recipient addresses
Also added larger assets for the delete icon as the others were
untappable!
Change-Id: Ib02dfcffc3d9e739586f5b502cf92f726cd5c0ef
hips/res/drawable-hdpi/delete.png
hips/res/drawable-mdpi/delete.png
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| 43876560a507b0672cd2732c74bdbdec84ed3893 |
01-Jun-2011 |
Mindy Pereira <mindyp@google.com> |
Setup a really cheesy delete icon.
This allows us to:
1) set a pressed state
2) get taps on the "delete icon" (the world remains thankful that I am
not a visual designer)
3) get the correctly tapped chip regardless of presses near the end
Change-Id: I286de87b05ac46aca1511a2c7108c6778438386e
hips/res/drawable-hdpi/delete.png
hips/res/drawable-mdpi/delete.png
hips/res/drawable/chip_background_selected.xml
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| b5dd668995d80a9bc9a6c5ed9f24a9d32a269634 |
31-May-2011 |
Mindy Pereira <mindyp@google.com> |
Fix tap logic and make moving tapped non complete contact to end work.
This change:
1) makes taps work more correctly to click / delete the correct items
2) takes a tapped on non-real contact and moves it to the end for editing.
3) make real contact show the rest of the information for the selected address
when tapped
Change-Id: Iaa778216dc3f0dc9880fdec2e84057a893d9211e
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| f566dee91901e44db63df3bf393afb1d43a36f78 |
31-May-2011 |
Mindy Pereira <mindyp@google.com> |
Multiple updates to chips.
1) Eliminate hardcoded 200 value for width of popup; this is just
the same as the width of the autocomplete view
2) eliminate need for offset padding; can calculate the correct position
(see calculateLineBottom for the full algo)
3) use recipientlistentry to track the contents of a chip; differentiate
between completed real contacts and filled in content. don't show popup
for non real contacts.
4) Change RecipientListEntry to just RecipientEntry
Change-Id: Icf2a47a845f1b3cad2fbae3d31c38179ca1b26c8
hips/res/values/attrs.xml
hips/res/values/dimen.xml
hips/src/com/android/ex/chips/BaseRecipientAdapter.java
hips/src/com/android/ex/chips/RecipientEditTextView.java
hips/src/com/android/ex/chips/RecipientEntry.java
hips/src/com/android/ex/chips/RecipientListEntry.java
|
| e3a582cc9b204f3f4150f81ec54da9872b3577a9 |
31-May-2011 |
Daisuke Miyakawa <dmiyakawa@google.com> |
Use LinkedHashMap to keep order.
Bug: 4443828
Change-Id: If6255c472509a6c55ebcd68f2a8908a1ea9f1603
hips/src/com/android/ex/chips/BaseRecipientAdapter.java
|
| 078509f1fd42ec04b46565ecc26f4f527b277c5c |
28-May-2011 |
Mindy Pereira <mindyp@google.com> |
Back to static library.
Give the library dimensions that the apps can use.
Change-Id: If55883a0f599baac3e4f9122620fc01b376fb512
hips/res/drawable/chip_background.xml
hips/res/drawable/chip_background_normal.xml
hips/res/drawable/chip_background_selected.xml
hips/res/values/attrs.xml
hips/res/values/colors.xml
hips/res/values/dimen.xml
hips/src/com/android/ex/chips/BaseRecipientAdapter.java
hips/src/com/android/ex/chips/RecipientEditTextView.java
|
| c88aedd2565b44c6369402426e51dca86b2c6a1e |
28-May-2011 |
Mindy Pereira <mindyp@google.com> |
Fix build. Should not be using R from the chips app.
Change-Id: Id63bc5d9bc47cd5b2bf0327784447f176da95884
hips/src/com/android/ex/chips/BaseRecipientAdapter.java
|
| f026dfb761c894942354060746a8ab7dd563386c |
28-May-2011 |
Mindy Pereira <mindyp@google.com> |
Make chips included source instead of static java library.
Get rid of abstract methods in BaseRecipientAdapter
Update makefile
Change-Id: I3415c73446c605e69c0c2145e98a7e66abc33a6e
hips/Android.mk
hips/java/com/android/ex/chips/BaseRecipientAdapter.java
hips/java/com/android/ex/chips/RecipientEditTextView.java
hips/java/com/android/ex/chips/RecipientListEntry.java
hips/java/com/android/ex/chips/Rfc822ChipTokenizer.java
hips/src/com/android/ex/chips/BaseRecipientAdapter.java
hips/src/com/android/ex/chips/RecipientEditTextView.java
hips/src/com/android/ex/chips/RecipientListEntry.java
hips/src/com/android/ex/chips/Rfc822ChipTokenizer.java
|
| 4334eac50ad87009874cb8b9af0572b0e2d8d4c8 |
27-May-2011 |
Mindy Pereira <mindyp@google.com> |
Merge "Chips implementation."
|
| ef2f73347ae0bf87b2874b6360ff06c5f430c68f |
26-May-2011 |
Daisuke Miyakawa <dmiyakawa@google.com> |
Add sharable resources for chips UI. add phone support
Each app still needs to specify framework/ex/chips/res/ directory
manually by modifying its LOCAL_RESOURCE_DIR variable in Android.mk
Changed API a bit to reduce abstract methods and complexity.
Bug: 4443828
Change-Id: I2a50de6d3ebd5ec6a68eeacbee21f48c1945dc8d
hips/java/com/android/ex/chips/BaseRecipientAdapter.java
hips/res/drawable-hdpi/bg_separator.9.png
hips/res/drawable-hdpi/ic_contact_picture.png
hips/res/drawable-mdpi/bg_separator.9.png
hips/res/drawable-mdpi/ic_contact_picture.png
hips/res/drawable/bg_separator_inset.xml
hips/res/layout/chips_recipient_dropdown_item.xml
hips/res/layout/chips_separator.xml
hips/res/layout/chips_separator_within_group.xml
|
| 2d4ee907769ccfc94dc315e932ff235198958c69 |
26-May-2011 |
Mindy Pereira <mindyp@google.com> |
Chips implementation.
Handles making chips from:
1) typing a lot then pressing enter
2) tapping a match in the dropdown
3) delete with tap on / backspace with cursor
4) replace
Does not handle: wrapping to new lines
enter submits first entry
Uses temporary backgrounds/ internal hardcoded values
Once I merge with Daisuke's changes for using library resources,
will update this.
Change-Id: Ic417c81a41aa85473772a2ea11643dd733080a7f
hips/java/com/android/ex/chips/RecipientEditText.java
hips/java/com/android/ex/chips/RecipientEditTextView.java
hips/java/com/android/ex/chips/Rfc822ChipTokenizer.java
|
| 24a05a268d1fa2839d62361dc50b88a4c2a2975b |
25-May-2011 |
Daisuke Miyakawa <dmiyakawa@google.com> |
Fix several bugs for BaseRecipientAdapter
- ignore contactId when it is invalid
- reduce number of queries toward directories
- fetch photos asynchronously
- utilize cache for photos and views
- remove unnecessary dependency on local variables
Bug: 4443828
Change-Id: I5a78eec1140beb3feb783c66a03bef85639e1fcb
hips/java/com/android/ex/chips/BaseRecipientAdapter.java
hips/java/com/android/ex/chips/RecipientEditText.java
hips/java/com/android/ex/chips/RecipientListEntry.java
|
| 41caab4c41a94712f8eeb1585422df52f8ab5db2 |
20-May-2011 |
Daisuke Miyakawa <dmiyakawa@google.com> |
Initial commit for chips UI library.
- create another directory for Chips UI.
- implement auto-complete list with photos
- introduce a stub EditText for chips implementation
-- RecipientEditText will be replaced shortly
BaseRecipientAdapter is based on CompositeCursorAdapter in
android-common library, but doesn't inherit it as they have
different assumptions (BaseRecipientAdapter doesn't rely on partition
but merge Directoryies' results).
Bug: 4443828
Change-Id: I74f48e73e44785edcc898690952a68b046ef5e0f
hips/Android.mk
hips/java/com/android/ex/chips/BaseRecipientAdapter.java
hips/java/com/android/ex/chips/RecipientEditText.java
hips/java/com/android/ex/chips/RecipientListEntry.java
|
| 14e3d050271ca4146eb747b52377db56a64ac501 |
20-May-2011 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with honeycomb-release
Change-Id: I2bdbe3b1b4538b763a010561ff08ba808af0ebe2
|
| 46a02894a12775c16c4588a168c3cbc767a6f983 |
06-May-2011 |
Jim Miller <jaggies@google.com> |
Fix unreported bug with CarouselTestActivity where incorrect items were shown.
The count was wrong for the number of items in the allocation pool since we
now prefetch more data.
Add demo code to show dialogs for events generated by Carousel
(select texture, select detail, long press).
Some other minor code cleanups.
Change-Id: Iebecd1945c115d96bd60a3968985c1b104b586d6
arousel/java/com/android/ex/carousel/CarouselRS.java
arousel/java/com/android/ex/carousel/carousel.rs
arousel/test/res/values/strings.xml
arousel/test/src/com/android/carouseltest/CarouselTestActivity.java
|
| 55392759e4f1fd3b17799ef8bd75d959dcf3b0a7 |
03-May-2011 |
Stephen Hines <srhines@google.com> |
Clean up use of rsSetObject/rsClearObject.
Change-Id: Iee58e5260654883beece74a04fc5f3a2eae329cb
arousel/java/com/android/ex/carousel/carousel.rs
|
| a15ab452e6a7603fb289666177aa13e5e4803d18 |
05-Apr-2011 |
Daisuke Miyakawa <dmiyakawa@google.com> |
Pass query parameters for primary account.
Should be after:
- Ibce363d336cb3e3a1fca10bddbd912ec96e4b059
- I2a22be56822226e3ea6b6f2ef23bb77816d0345a
Bug: 3510087
Change-Id: I7e4f4fa01a237fa82521c5f57c258ee599933d60
ommon/java/com/android/common/contacts/BaseEmailAddressAdapter.java
|
| dd570db14b403c59edb96d5c754736a1995cfe17 |
29-Mar-2011 |
Ying Wang <wangying@google.com> |
Build android-common-carousel against the SDK 12.
Change-Id: I2299266b21b4d7ded2501f87abe90e11e8ec22ad
arousel/Android.mk
|
| 2cf7d5b78744e0d95951ddd631ca11904296ba7c |
03-Mar-2011 |
Jim Miller <jaggies@google.com> |
Fix 3404464: Minor tweak to Carousel scale-up animation
Change-Id: Ieb21634a68d8f5b9f1b411c547c18e32349c4d9e
arousel/java/com/android/ex/carousel/carousel.rs
|
| ceae13b8f2ae7342506ecb4e4fcce956dbb12af7 |
02-Mar-2011 |
Jim Miller <jaggies@google.com> |
Fix 3404464: Add scale-down animation to Carousel
This changes the behavior to avoid snapping back to the original
size, which was a very jarring effect. Instead, Carousel now has
a scale-down animation that is triggered when the user releases the item.
Change-Id: I81a91e65d0da991a98211f2ecb92fa89c8c81e22
arousel/java/com/android/ex/carousel/carousel.rs
arousel/test/src/com/android/carouseltest/MyCarouselView.java
|
| b4959ac31abdaf6ab7309c17f56fceaa1baabed7 |
24-Feb-2011 |
Bryan Mawhinney <bryanmawhinney@google.com> |
Draw 2 additional slots on either side of visibleSlotCount.
This fixes an issue where book shadows disappeared too quickly.
Change-Id: Idc8ef5af2c334fa4eb3f0514e79a25fd82f5cae8
arousel/java/com/android/ex/carousel/carousel.rs
|
| 73b524072839e23684acc2de22fbee5bb7181b7e |
23-Feb-2011 |
Bryan Mawhinney <bryanmawhinney@google.com> |
Merge "Don't treat prefetched cards as visible."
|
| 5ac1de00d4441748a4b183b5d406298cd18f2d27 |
18-Feb-2011 |
Bryan Mawhinney <bryanmawhinney@google.com> |
Don't treat prefetched cards as visible.
Previously, prefetched cards were considered visible,
which is inefficient when the number of cards to prefetch is
large, and can confuse the hit detection logic (see b3468797)
Change-Id: I91e150c52b88608eb8627edc8cce30ecfb44e672
arousel/java/com/android/ex/carousel/carousel.rs
|
| 55b237bcd720774e27248f5fecf6c32a3f420a4c |
17-Feb-2011 |
Jim Miller <jaggies@google.com> |
Fix 3180048: Add finite velocity history tracking to Carousel
Before this change, Carousel sometimes showed chaotic movement
when a long history of motion was captured because of the
infinite history of velocities used to calculate the average.
The code now limits the number of historical velocities to a
small number, which results in much more predictable motion.
Change-Id: I4edadbde5464749646dcce50495e54b3abb73901
arousel/java/com/android/ex/carousel/carousel.rs
|
| f88df948fc7821e33b3165bb969b2b9cb38a8b49 |
08-Feb-2011 |
Arnaud Berry <arnaudberry@google.com> |
Merge "Added a way to trigger an interpolated rotation of the carousel"
|
| 8debeb8a0a785f0ad66bc75200cdb47c137602bc |
08-Feb-2011 |
Arnaud Berry <arnaudberry@google.com> |
Added a way to trigger an interpolated rotation of the carousel
Change-Id: I4717952f5fe6b5d99699e55d93abcd1cb1fc1986
arousel/java/com/android/ex/carousel/CarouselController.java
arousel/java/com/android/ex/carousel/CarouselRS.java
arousel/java/com/android/ex/carousel/CarouselView.java
arousel/java/com/android/ex/carousel/carousel.rs
|
| b2bc02c2fcd71d6d971e772a3d9dba0d1b065223 |
08-Feb-2011 |
Jason Sams <rjsams@android.com> |
am 8a357ebe: Update to public APIs. Remove use of private depricated APIs.
* commit '8a357ebe4ae3063dbb3d8b3bdf6f665b05dd8e6f':
Update to public APIs. Remove use of private depricated APIs.
|
| cfc6219e3a3d83952197504067bdb7173a10977c |
05-Feb-2011 |
The Android Automerger <android-build@android.com> |
merge in honeycomb-release history after reset to honeycomb
|
| e20874594201517e0f2d39b9b972dbd58054e92c |
05-Feb-2011 |
The Android Automerger <android-build@android.com> |
merge in honeycomb-release history after reset to honeycomb
|
| 7f816531cbb89a42b4453c40bd987951e4b869a9 |
05-Feb-2011 |
The Android Automerger <android-build@android.com> |
merge in honeycomb-release history after reset to honeycomb
|
| e5cd7c250059a257a674542383e987fe22abce4f |
04-Feb-2011 |
The Android Automerger <android-build@android.com> |
merge in honeycomb-release history after reset to honeycomb
|
| b923d69361aa3bd1b0563c4b2df0fcefeb57163f |
04-Feb-2011 |
The Android Automerger <android-build@android.com> |
merge in honeycomb-release history after reset to honeycomb
|
| 277f43ca49166e859901d6bb179d70ca57dd0c96 |
04-Feb-2011 |
The Android Automerger <android-build@android.com> |
merge in honeycomb-release history after reset to honeycomb
|
| 8a357ebe4ae3063dbb3d8b3bdf6f665b05dd8e6f |
04-Feb-2011 |
Jason Sams <rjsams@android.com> |
Update to public APIs.
Remove use of private depricated APIs.
Change-Id: I1f1fd0046bf5c9680b35c428afa40f5e4e19e222
arousel/java/com/android/ex/carousel/carousel.rs
|
| 641881a8167529466b94bd3b3caf3576bce256dc |
04-Feb-2011 |
The Android Automerger <android-build@android.com> |
merge in honeycomb-release history after reset to honeycomb
|
| 198d6a379e43cef01f010f25787e7b5387ee6aa1 |
03-Feb-2011 |
The Android Automerger <android-build@android.com> |
merge in honeycomb-release history after reset to honeycomb
|
| de1075700a1ff430a3af3e133b39be17e68cf0b9 |
03-Feb-2011 |
The Android Automerger <android-build@android.com> |
merge in honeycomb-release history after reset to honeycomb
|
| 014b4893d41876a908d8970bc84b560c245ba629 |
03-Feb-2011 |
The Android Automerger <android-build@android.com> |
merge in honeycomb-release history after reset to honeycomb
|
| 3ae29f7a21283214c6216780873104b4f8d312a2 |
02-Feb-2011 |
The Android Automerger <android-build@android.com> |
merge in honeycomb-release history after reset to honeycomb
|
| a8a8f6ae4a6f0d0bd4879d290b88240801da7cf0 |
01-Feb-2011 |
The Android Automerger <android-build@android.com> |
merge in honeycomb-release history after reset to honeycomb
|
| e7a80304c00cd9fcfd2a4dfe214ce3a2a828c58b |
01-Feb-2011 |
The Android Automerger <android-build@android.com> |
merge in honeycomb-release history after reset to honeycomb
|
| 42813c328294b3355b7986f1c5987302132e7da1 |
01-Feb-2011 |
Jim Shuma <jshuma@google.com> |
am dbd55217: Disable long-press animation
* commit 'dbd552175226ac69aea606953cdd3c03a58bd2cc':
Disable long-press animation
|
| dbd552175226ac69aea606953cdd3c03a58bd2cc |
31-Jan-2011 |
Jim Shuma <jshuma@google.com> |
Disable long-press animation
Bug: 3404464
Change-Id: Ife6b29241e47727bc980753d0233da3a4a945779
arousel/java/com/android/ex/carousel/carousel.rs
|
| 3a5dfca5ed2abe919f0bd8d35a381cf9798c1244 |
30-Jan-2011 |
The Android Automerger <android-build@android.com> |
merge in honeycomb-release history after reset to honeycomb
|
| 6dc4adab40e3f9aeaa4bd974b6f760a6ac3b8a64 |
30-Jan-2011 |
The Android Automerger <android-build@android.com> |
merge in honeycomb-release history after reset to honeycomb
|
| 1a4b6fcf088aa0571293b56048f609211f214fd8 |
29-Jan-2011 |
The Android Automerger <android-build@android.com> |
merge in honeycomb-release history after reset to honeycomb
|
| a259190d9162683fca8c7021a9e7c6fb9e268d40 |
28-Jan-2011 |
The Android Automerger <android-build@android.com> |
merge in honeycomb-release history after reset to honeycomb
|
| 0c0960f084c42397c57c45e51e756e7be214fab8 |
27-Jan-2011 |
The Android Automerger <android-build@android.com> |
merge in honeycomb-release history after reset to honeycomb
|
| 9d4157ce1a4214fc0453bb234c32faf464eb1748 |
26-Jan-2011 |
The Android Automerger <android-build@android.com> |
merge in honeycomb-release history after reset to honeycomb
|
| 57cca09b47d32d329177708bc4c58a7326efb0ac |
25-Jan-2011 |
The Android Automerger <android-build@android.com> |
merge in honeycomb-release history after reset to honeycomb
|
| bc461a888b3f713ad8834e27df84d4603c9390e9 |
24-Jan-2011 |
Jim Shuma <jshuma@google.com> |
am b7139267: Merge "Proper error checking for setting cards" into honeycomb
* commit 'b713926766c4b342a881cb251964050a0d3d0a41':
Proper error checking for setting cards
|
| b713926766c4b342a881cb251964050a0d3d0a41 |
24-Jan-2011 |
Jim Shuma <jshuma@google.com> |
Merge "Proper error checking for setting cards" into honeycomb
|
| 3e314f1adf5f818eda83220cef5209193e298942 |
24-Jan-2011 |
Jim Shuma <jshuma@google.com> |
am 0de20d1e: Invalidate unloaded textures to unloaded
* commit '0de20d1ebd3dc8e766f7f4f4dbc3f77dd7326e30':
Invalidate unloaded textures to unloaded
|
| 2309190cc0691458a01160c71cc37777697105a9 |
24-Jan-2011 |
The Android Automerger <android-build@android.com> |
merge in honeycomb-release history after reset to honeycomb
|
| ec18350090abbba03c3f0c9f0511cfde4afee66f |
24-Jan-2011 |
Jim Shuma <jshuma@google.com> |
Proper error checking for setting cards
When shrinking the cards array while invalidates are still
in flight, it's possible to have an invalidate or texture
set land on a nonexistent card, causing an out-of-bounds
exception to be thrown, crashing the app. Frequently these
invalidates come from the user dragging the carousel to
another position, so it's not feasible to prevent
invalidates from being sent when we're about to clear the
cards array; nor is it feasible to empty any pending
invalidates, since Renderscript does not provide any
meaningful inspection of the event queue. Therefore, the
only real way we can address the problem is by detecting
these out-of-turn invalidates and handling the errors
cleanly. In practice, since these events are typically to
invalidate a nonexistent card, it's OK to just drop them,
since each such card is already invalid because it does
not exist.
This fix factors out card-get and card-set logic into
common methods, similar to card-set-or-create logic that's
been present for a long time.
Bug: 3381300
Change-Id: I037801de3b4c3bff514b1586fa16417e32c118df
arousel/java/com/android/ex/carousel/CarouselRS.java
|
| 0de20d1ebd3dc8e766f7f4f4dbc3f77dd7326e30 |
23-Jan-2011 |
Jim Shuma <jshuma@google.com> |
Invalidate unloaded textures to unloaded
When invalidateTexture() is told to continue drawing the
current texture until a replacement is found (STATE_STALE),
but the texture was not there in the first place since it
hadn't loaded yet, later attempts to draw the texture based
on the assumption of its being there (by virtue of being in
STATE_STALE or STATE_UPDATING) would result in rendering
problems due to trying to bind a nonexistent texture. The
fix is to make invalidateTexture() only set STATE_STALE if
a valid texture had been there in the first place.
As an added precautionary measure, this change also has a
stopgap solution that will draw the placeholder image if
the state machine indicates the texture is valid but it is
not actually valid. This case should never be encountered.
Bug: 3356101
Change-Id: Ia87e9e651f8ac3138faced3cf0f6199c58ee51e0
arousel/java/com/android/ex/carousel/carousel.rs
|
| 22e12af3aa08e98fefc46a13e2efe7fbd0e4fe53 |
23-Jan-2011 |
The Android Automerger <android-build@android.com> |
merge in honeycomb-release history after reset to honeycomb
|
| 569245fa6e2114a17dbf848b5b070e289a0f314e |
22-Jan-2011 |
The Android Automerger <android-build@android.com> |
merge in honeycomb-release history after reset to honeycomb
|
| 67435dfd7fcad429b587c8b3c1c14005d9067bf4 |
21-Jan-2011 |
The Android Automerger <android-build@android.com> |
merge in honeycomb-release history after reset to honeycomb
|
| a6dfe4f864e567a445c4f934dfee69b4d909c0f8 |
20-Jan-2011 |
The Android Automerger <android-build@android.com> |
merge in honeycomb-release history after reset to honeycomb
|
| 4ddc71fff3a41ad8ab5c1bf526567b4ab0a4e989 |
20-Jan-2011 |
Gilles Debunne <debunne@google.com> |
am 86018e02: Merge "Preventive fix in setNotificationsEnabled" into honeycomb
* commit '86018e0266578b120b9ad4133a6f189d2a3eac47':
Preventive fix in setNotificationsEnabled
|
| 86018e0266578b120b9ad4133a6f189d2a3eac47 |
20-Jan-2011 |
Gilles Debunne <debunne@google.com> |
Merge "Preventive fix in setNotificationsEnabled" into honeycomb
|
| 7c76d5f2cd2cc35e7c4f33264d5f281c96351377 |
20-Jan-2011 |
Gilles Debunne <debunne@google.com> |
Preventive fix in setNotificationsEnabled
This code
setNotificationsEnabled(false);
...
notifyDataChanged();
...
setNotificationsEnabled(false);
should not notify that a change happended.
Change-Id: Ia639530dcc2a34c24a7edbe2d2ba3530d22cacb9
ommon/java/com/android/common/widget/CompositeCursorAdapter.java
|
| b3395efeaaa3f4394a455cb181f38f15885102da |
19-Jan-2011 |
The Android Automerger <android-build@android.com> |
merge in honeycomb-release history after reset to honeycomb
|
| e3cfb7957d17a15b82fe1efa3ed36ad7093d487c |
19-Jan-2011 |
Jim Shuma <jshuma@google.com> |
am 7d27aa43: Arrange cards based on default matrix
* commit '7d27aa4388936d7607407d25cc52d42e00f6567a':
Arrange cards based on default matrix
|
| 7d27aa4388936d7607407d25cc52d42e00f6567a |
19-Jan-2011 |
Jim Shuma <jshuma@google.com> |
Arrange cards based on default matrix
Previously we were arranging cards on the screen using the
individual card's matrix. When the card matrices are
different, however, this leads to an inconsistent layout.
Instead, use the default card matrix for layout, while
using the individaul card matrix (which, when not set
separately, is the same as the default card matrix) for
handling drawing the individual card.
Bug: 3365044
Change-Id: Ibb7ad7760131d2c649cc0882b784c9d2e73a737f
arousel/java/com/android/ex/carousel/carousel.rs
|
| dd14e126e2516a3dd4b133c811182d807e4f8b80 |
18-Jan-2011 |
The Android Automerger <android-build@android.com> |
merge in honeycomb-release history after reset to honeycomb
|
| eae6bd4e7ceb416f984bffbe60749d8e95fa33e6 |
17-Jan-2011 |
Jim Miller <jaggies@google.com> |
am 396b1eb7: Fix bitrot in Carousel demo.
* commit '396b1eb70452e27942550efaa06e10da84fc58db':
Fix bitrot in Carousel demo.
|
| 396b1eb70452e27942550efaa06e10da84fc58db |
17-Jan-2011 |
Jim Miller <jaggies@google.com> |
Fix bitrot in Carousel demo.
Change-Id: I4151f20458b72f339bf636f7324b8dbbe33e6635
arousel/test/src/com/android/carouseltest/MusicDemoActivity.java
|
| 9bc222a93efe58a276e957368eaafd1d913f070d |
17-Jan-2011 |
The Android Automerger <android-build@android.com> |
merge in honeycomb-release history after reset to honeycomb
|
| 1bcf92d3bca1094bc085ce9cc1291e61bb307d24 |
17-Jan-2011 |
Ficus Kirkpatrick <ficus@android.com> |
am 10c28c7f: Don\'t change the visibility of overridden methods.
* commit '10c28c7f31687ff57476d0a7381461fef71cc5cb':
Don't change the visibility of overridden methods.
|
| cf66fe4325be54ea39ce6bc3e2eded3366acbf54 |
16-Jan-2011 |
The Android Automerger <android-build@android.com> |
merge in honeycomb-release history after reset to honeycomb
|
| 10c28c7f31687ff57476d0a7381461fef71cc5cb |
16-Jan-2011 |
Ficus Kirkpatrick <ficus@android.com> |
Don't change the visibility of overridden methods.
ArrowKeyMovementMethod defines up, down, left, and right
to be protected, so StyledTextArrowKeyMethod shouldn't
change them to be private.
Change-Id: I0e58b9d2ee042b5c7985b664bab299ff618f8116
ommon/java/com/android/ex/editstyledtext/EditStyledText.java
|
| 0e1578aeaca364ef88289c4712990044c66fbc0d |
14-Jan-2011 |
The Android Automerger <android-build@android.com> |
merge in honeycomb-release history after reset to honeycomb
|
| 275145a461d4451e71a97fe016ecdd92079a304b |
13-Jan-2011 |
Alex Sakhartchouk <alexst@google.com> |
am 52b26266: Some names changed during API review, updating carousel to reflect them.
* commit '52b26266238d124ec2831835a90988f89304218e':
Some names changed during API review, updating carousel to reflect them.
|
| 52b26266238d124ec2831835a90988f89304218e |
13-Jan-2011 |
Alex Sakhartchouk <alexst@google.com> |
Some names changed during API review, updating carousel to reflect them.
Change-Id: Ib08f4f7997d5e06891d5ce09cc7bff6c0f61f341
arousel/java/com/android/ex/carousel/CarouselRS.java
|
| 396598b40763dcb1fa5cbb504ad15d1935f04fed |
13-Jan-2011 |
The Android Automerger <android-build@android.com> |
merge in honeycomb-release history after reset to honeycomb
|
| 81716139c57dea69f5cb11977b28348aa6dbf4da |
12-Jan-2011 |
The Android Automerger <android-build@android.com> |
merge in honeycomb-release history after reset to honeycomb
|
| 773ff3e89a37a6df8239af4b32c9279d98c24754 |
12-Jan-2011 |
Jim Shuma <jshuma@google.com> |
am c2baf88a: Allow specifying per-card matrices
* commit 'c2baf88a763ae0e3694c8a10c13f203db9aec363':
Allow specifying per-card matrices
|
| c2baf88a763ae0e3694c8a10c13f203db9aec363 |
12-Jan-2011 |
Jim Shuma <jshuma@google.com> |
Allow specifying per-card matrices
Set a per-card matrix through the newly expanded
TextureParameters mechanism.
This also changes the behavior of the card matrix so that
it is applied locally to the card, rather than being
applied to the whole carousel. And the detail texture is
no longer drawn with the card matrix.
Bug: 3206251
Change-Id: I5119bc97b136d32cf9d4e29e7aa3751334cc68c1
arousel/java/com/android/ex/carousel/CarouselController.java
arousel/java/com/android/ex/carousel/CarouselRS.java
arousel/java/com/android/ex/carousel/CarouselView.java
arousel/java/com/android/ex/carousel/CarouselViewHelper.java
arousel/java/com/android/ex/carousel/carousel.rs
|
| 4207d585e2700a49d10bf9a7328525824e5db126 |
11-Jan-2011 |
The Android Automerger <android-build@android.com> |
merge in honeycomb-release history after reset to honeycomb
|
| c750c152d195bdfc3c8b19ee6bc607f936b8ba31 |
11-Jan-2011 |
The Android Automerger <android-build@android.com> |
merge in honeycomb-release history after reset to honeycomb
|
| f7423fa7f875117bb56c84569df5a1ee43670d09 |
10-Jan-2011 |
The Android Automerger <android-build@android.com> |
merge in honeycomb-release history after reset to honeycomb
|
| 64b91a659fc0642e7dea4645e1a3e48c77fec108 |
07-Jan-2011 |
The Android Automerger <android-build@android.com> |
merge in honeycomb-release history after reset to honeycomb
|
| 7a9e3d7c27e65814579f3023604a96d77ad641fc |
06-Jan-2011 |
Maryam Garrett <mkamvar@google.com> |
Merge "Fix: don't change values of constants"
|
| 71a8014a4373b4e25ac5d566ad38c9c2a3332958 |
06-Jan-2011 |
The Android Automerger <android-build@android.com> |
merge in honeycomb-release history after reset to honeycomb
|
| d3bf20af9d11a64d9c94d2f166651dc684caacf8 |
05-Jan-2011 |
The Android Automerger <android-build@android.com> |
merge in honeycomb-release history after reset to master
|
| 1505ab86624cd505aacb5244a65495e7bb4f1d66 |
05-Jan-2011 |
The Android Automerger <android-build@android.com> |
merge in honeycomb-release history after reset to master
|
| 88287b58d54e7a6413992fe290832a5835fd0c0f |
20-Dec-2010 |
Dmitri Plotnikov <dplotnikov@google.com> |
Moving SQLiteContentProvider to the ex framework
Change-Id: I54d3d6e7fb3df41196dc2a9b647fd5d23b83d43a
ommon/java/com/android/common/content/SQLiteContentProvider.java
|
| 825a157fe25e8883cc280b2091b381e4f22949b8 |
04-Jan-2011 |
The Android Automerger <android-build@android.com> |
merge in honeycomb-release history after reset to master
|
| d696cd4dc90b92e7653d5bcb0b14654c588e9d7d |
29-Dec-2010 |
Jim Shuma <jshuma@google.com> |
Reset cards array on createCards(0)
createCards(0) is used to clear out an array. As such, it's
appropriate to entirely replace the array, rather than
resizing to size 1, which leaves stale data behind.
Bug: 3314456
Change-Id: Ifa1eb4a01ad9f5cc09c3cd6edce5de3f9602d9f0
arousel/java/com/android/ex/carousel/CarouselRS.java
|
| b2afcf55a1aa70020510550fd6d48726c41b5cf5 |
22-Dec-2010 |
The Android Automerger <android-build@android.com> |
merge in honeycomb-release history after reset to master
|
| 819c18b25f5316429f34f975178999876c75b1de |
21-Dec-2010 |
Alex Sakhartchouk <alexst@google.com> |
Renderscript API cleanup
Change-Id: I7235d93bbbcefd921294582d5f901e2a53d9701e
arousel/java/com/android/ex/carousel/CarouselRS.java
|
| a83141be7e6955416079da45cba78652241382f8 |
21-Dec-2010 |
The Android Automerger <android-build@android.com> |
merge in honeycomb-release history after reset to master
|
| d57f48b395d79a201d09ff7981a03191ce3c7f8c |
20-Dec-2010 |
Maryam Garrett <mkamvar@google.com> |
am e0d5045a: (-s ours) DO NOT MERGE:Changes in master, which did not make it into GB
* commit 'e0d5045a56146f0e7d8ea9e400f6eb209edceec5':
DO NOT MERGE:Changes in master, which did not make it into GB
|
| 489f893df40ea353d330879389c73102742df8bc |
17-Dec-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'master' into honeycomb-release
* master:
Allow fading of the entire card
Remove unnecessary uploads.
|
| 3adf712e636f67265da7a6ff425c87e63fc20884 |
17-Dec-2010 |
Jim Shuma <jshuma@google.com> |
Allow fading of the entire card
Give cards an overall timestamp, separate from the texture
timestamp. This allows cards to fade in before their
texture has been set.
Bug: 3281327
Change-Id: I9405636ebcbfc2c27d777d435f3abf24265dfbe9
arousel/java/com/android/ex/carousel/CarouselController.java
arousel/java/com/android/ex/carousel/CarouselRS.java
arousel/java/com/android/ex/carousel/carousel.rs
|
| 77bf0562976f0571861012c8506517914efa2bbe |
16-Dec-2010 |
Jason Sams <rjsams@android.com> |
Remove unnecessary uploads.
Change-Id: I6970953b717e6c667c5111a73db26a0bbe36e56e
arousel/java/com/android/ex/carousel/CarouselRS.java
|
| 0cca02142a3c470a66ff04f1062d2a10278a34ef |
16-Dec-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'master' into honeycomb-release
* master:
Fix a bug causing store config to be lost on rotate
|
| ac1d1fd9b14ce42aa9e04f8c472039790d736786 |
16-Dec-2010 |
Jim Shuma <jshuma@google.com> |
Fix a bug causing store config to be lost on rotate
Store configs were getting lost on orientation change,
since they weren't being stored right. This fixes that.
Change-Id: I4b256764347e3e7462fb4532254565d81bfc8980
arousel/java/com/android/ex/carousel/CarouselController.java
arousel/java/com/android/ex/carousel/CarouselRS.java
|
| c92121bf40ff8105687dc05e603af95791105edf |
15-Dec-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'master' into honeycomb-release
|
| 0508a5d4e679d52de6e902c07e63d5856225d616 |
15-Dec-2010 |
Jason Sams <rjsams@android.com> |
Update for Allocation API changes.
Change-Id: If3b9d05825adf1bdb495f36e7d020af1bbdb5c7a
arousel/java/com/android/ex/carousel/CarouselRS.java
|
| f664659f79399e92025e1dfe1ffbb682ff05613c |
12-Dec-2010 |
Jim Shuma <jshuma@google.com> |
Allow specifying configurations for mesh primitives
This lets you specify separate alpha, depth read, and depth
write behaviors for each primitive in your mesh. It will be
used by Books to allow drawing shadows separately from the
main model.
Change-Id: I9351f720e6e09260b5bcd335e305922ff48cb373
arousel/java/com/android/ex/carousel/CarouselController.java
arousel/java/com/android/ex/carousel/CarouselRS.java
arousel/java/com/android/ex/carousel/carousel.rs
|
| 1a5b4d109397ea175b5cbaa7490ca18e78eb040f |
15-Dec-2010 |
Simon Wilson <simonwilson@google.com> |
Allow top-to-bottom card order when rowCount>1
Add a member function to CarouselRS.java called setFirstCardTop()
to allow the first card to appear on top instead of the bottom
when rowCount>1. The default is false, meaning the existing
behaviour is not changed for other apps.
Change-Id: I38d666958ebb802e211496895cbe3f91e78f5392
arousel/java/com/android/ex/carousel/CarouselController.java
arousel/java/com/android/ex/carousel/CarouselRS.java
arousel/java/com/android/ex/carousel/CarouselView.java
arousel/java/com/android/ex/carousel/carousel.rs
|
| 2f02a95d73428a8d77e521b9bcb987c405c48833 |
13-Dec-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'master' into honeycomb-release
|
| 358868df5043b240c9a241c7bb75128ff94b1f34 |
09-Dec-2010 |
Bryan Mawhinney <bryanmawhinney@google.com> |
Use ids rather than Meshes when specifying default / loading geometries.
This allows them to be reloaded when required, thus fixing
http:/b/3237395
Change-Id: I9eea73d85a8c272debbfb45d5577ded185cf8112
arousel/java/com/android/ex/carousel/CarouselController.java
arousel/java/com/android/ex/carousel/CarouselRS.java
arousel/java/com/android/ex/carousel/CarouselView.java
|
| d7e47e20a325a133d52950454666499d13e3b0d1 |
08-Dec-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'master' into honeycomb-release
|
| e8cab95c5f73ddf6843d82793decc3adb4692860 |
04-Dec-2010 |
Jim Shuma <jshuma@google.com> |
Add more feedback parameters to onCardLongPress
onCardLongPress now passes information about the detail
texture being passed, and where the touch happened.
Also fixing a bug that caused long-press to be interpreted
as selection.
Change-Id: I4ee189c7c006abbc6ad71ac60778d1f18e8684a2
arousel/java/com/android/ex/carousel/CarouselRS.java
arousel/java/com/android/ex/carousel/CarouselViewHelper.java
arousel/java/com/android/ex/carousel/carousel.rs
|
| 67aff87dac9eab54810ade7e0b626a5c2fee6b39 |
07-Dec-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'master' into honeycomb-release
|
| 27b81f375cfa65f4f689c64bd2c48e3a56c1e11b |
07-Dec-2010 |
Jason Sams <rjsams@android.com> |
Update to API cleanup
Change-Id: I3b5add1a98f10ca47cf26c004f8ca4f3353da1f8
arousel/java/com/android/ex/carousel/CarouselRS.java
arousel/java/com/android/ex/carousel/CarouselView.java
arousel/java/com/android/ex/carousel/CarouselViewHelper.java
|
| e26fadd96cff3251d7ed391e10ab9c372ce5e825 |
06-Dec-2010 |
Bryan Mawhinney <bryanmawhinney@google.com> |
Exit overscroll mode when the user interacts with the carousel.
This ensure that when the user releases the carousel, we don't
automatically revert to overscroll mode unless we're still in
the overscroll area.
Change-Id: I1cec3380452383e2ba70b1dfab540a53e8289838
arousel/java/com/android/ex/carousel/carousel.rs
|
| e8352c30139b6f1be8e5b74a1570467b07faa604 |
04-Dec-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'master' into honeycomb-release
|
| 8441b1025afe64748f9e3483baacee92171bbfa3 |
02-Dec-2010 |
Jeff Sharkey <jsharkey@android.com> |
Enable invalidation of carousel textures.
Mirrors existing implementation of detail texture invalidation. Also
fixes issue where eraseCurrent was being ignored.
Fixes http://b/3246908.
Change-Id: I7348536b43b1ccf6b7df2389a1100c3d5b1671a8
arousel/java/com/android/ex/carousel/CarouselController.java
arousel/java/com/android/ex/carousel/CarouselRS.java
arousel/java/com/android/ex/carousel/carousel.rs
|
| 6764745e76207e79abbf263d5d415e198140660a |
02-Dec-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'master' into honeycomb-release
|
| b2c785780ecbe79a5b7ba558b21985f956458c8c |
02-Dec-2010 |
Jim Shuma <jshuma@google.com> |
Tap to stop the carousel
When the carousel is moving faster than 15 degrees per
second, a tap will stop the motion but not be interpreted
as a selection. Slower than that, it will be considered a
selection.
This is an improvement on an earlier implementation because
it lets through selections when the carousel is still
moving slowly.
Bug: 3179984
Change-Id: I27b55cf88e20d4ef1383ec0e4144f65a101f37fc
arousel/java/com/android/ex/carousel/carousel.rs
|
| 9af9e25599960f36c56a9808f98e3fa7b048c7ac |
01-Dec-2010 |
Maryam Garrett <mkamvar@google.com> |
Fix: don't change values of constants
I shouldnt have renamed length -> mlength. This reverts that mistake.
Change-Id: I92eff11b395933912d4010a3e9b996f7b47cf756
ommon/java/com/android/common/speech/LoggingEvents.java
|
| e0d5045a56146f0e7d8ea9e400f6eb209edceec5 |
30-Nov-2010 |
Maryam Garrett <mkamvar@google.com> |
DO NOT MERGE:Changes in master, which did not make it into GB
The original change simply added 3 extra constants to be used for logging
information related to alternative word selection from the n-best list
which is returned for voice ime recognition results
Bug: 3243768
Change-Id: Ib01184901c7b4a50235877664993d26940cfe43c
ommon/java/com/android/common/speech/LoggingEvents.java
|
| 9dbc3d0c090713dd613f2576532667058030f727 |
01-Dec-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'master' into honeycomb-release
|
| 9c019da0f3083c4b82552fb2fe5b052f90073cb9 |
30-Nov-2010 |
Bryan Mawhinney <bryanmawhinney@google.com> |
Ensure default card matrix is set before creating cards.
Change-Id: I3fd55a3332f319c2a3a7a9c9f1a1351e48c0d178
arousel/java/com/android/ex/carousel/CarouselController.java
|
| 1a7774eedc6fc19ee9d0f3fb95f6808b4e3b598f |
23-Nov-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'master' into honeycomb-release
|
| 5b54f405b4a1afcf57b5ccee2026a00a1004be20 |
23-Nov-2010 |
Bryan Mawhinney <bryanmawhinney@google.com> |
Ensure that card 0 is properly initialized.
Previously, when calling setCardCount(0) followed by setCardCount(n),
only cards 1-n would be initialized. This prevented the first card
from being drawn correctly.
Change-Id: I5697553a6dba12825f546468747220ce67e904ef
arousel/java/com/android/ex/carousel/carousel.rs
|
| 2facf8ec4ba0a075706254f62bd23e50d8823f04 |
22-Nov-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'master' into honeycomb-release
|
| 51dd0196e4f3bd4086545f5bf30038ca9ad9ac27 |
20-Nov-2010 |
Bryan Mawhinney <bryanmawhinney@google.com> |
Allow user to specify a custom matrix to transform cards.
Change-Id: I28901c4bdee160c06deae1167489510122d45e98
arousel/java/com/android/ex/carousel/CarouselController.java
arousel/java/com/android/ex/carousel/CarouselRS.java
arousel/java/com/android/ex/carousel/CarouselView.java
arousel/java/com/android/ex/carousel/carousel.rs
|
| 576c4d21d36dc719bc4863c6c0e52a63405ff98a |
19-Nov-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'master' into honeycomb-release
|
| 9336f7e620e320b3c10336446a1bcf1f53ecfa97 |
19-Nov-2010 |
Stephen Hines <srhines@google.com> |
Remove unnecessary export_func pragma.
Change-Id: Ib0b24b56380211aa6775e4fca9d3fcab4c743d7b
arousel/java/com/android/ex/carousel/carousel.rs
|
| 370b177eb74cd8a7d9a2ab06a5ee8bb3ed25f74f |
18-Nov-2010 |
Stephen Hines <srhines@google.com> |
Mark non-exported functions as static.
Change-Id: I99ab499fa1208cb322ce2dffecd909f01693c158
arousel/java/com/android/ex/carousel/carousel.rs
|
| 53b672945b44aa146c73221193970742dc6a048b |
18-Nov-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'master' into honeycomb-release
|
| 14d2c1ec52bb04b5120c2bfdd1a8811a238573ce |
17-Nov-2010 |
Jim Shuma <jshuma@google.com> |
Allow clients to draw carousel cards clockwise
This consists of the following:
- Plumb the new fillDirection parameter
- Set the slotPosition (and consequently the cardPosition)
at the appropriate points
- Compute motion and overscroll based not on first and last
bias but on lowest and highest bias.
- Let cullCards() allow thetaFirst > thetaLast
Bug: 3177563
Change-Id: I2bb7b3f906726db5ced2ea5bad0e5395f5821d1d
arousel/java/com/android/ex/carousel/CarouselController.java
arousel/java/com/android/ex/carousel/CarouselRS.java
arousel/java/com/android/ex/carousel/CarouselView.java
arousel/java/com/android/ex/carousel/carousel.rs
|
| 943d58e9fba0a2ba3ba09c21ba4fdb46743c337a |
17-Nov-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'master' into honeycomb-release
|
| 0f529a84c393814bccd851d94c34b77558dcbab0 |
16-Nov-2010 |
Jim Shuma <jshuma@google.com> |
Don't throw an exception when invalidating an unset card
If the user calls invalidateDetailTexture() before calling
setDetailTexture(), don't throw an exception; just silently
ignore the call.
Change-Id: I9945a32319dd04729aa2b42b4c15a8d2880903d4
arousel/java/com/android/ex/carousel/CarouselRS.java
|
| ed5cdfa293ec57cb14b98cdc3fa00ac5ec1c1ed4 |
16-Nov-2010 |
Stephen Hines <srhines@google.com> |
Remove zero-init/destructor WARs.
Change-Id: I27da6a11c2325711194b123c6fdc3d2a7bdf02a8
arousel/java/com/android/ex/carousel/carousel.rs
|
| 0cec8afdb4f9d78adf88c9b9b41e993aef617bea |
12-Nov-2010 |
Bryan Mawhinney <bryanmawhinney@google.com> |
Add multiple row support to carousel.
Change-Id: Ic4f2586b1ff45a40c03a728b1664c55977c7b846
arousel/java/com/android/ex/carousel/CarouselController.java
arousel/java/com/android/ex/carousel/CarouselRS.java
arousel/java/com/android/ex/carousel/CarouselView.java
arousel/java/com/android/ex/carousel/carousel.rs
|
| fa45365e164350cc05640b68e54aab07489faebf |
16-Nov-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'master' into honeycomb-release
|
| 6af401bca5f8854524d128e9df5700035fae1160 |
12-Nov-2010 |
Jim Shuma <jshuma@google.com> |
Add updateDetailTexture to allow updating detail textures
Change-Id: Id0d3146142bc7019523c038cacbfffb71db56594
arousel/java/com/android/ex/carousel/CarouselController.java
arousel/java/com/android/ex/carousel/CarouselRS.java
arousel/java/com/android/ex/carousel/carousel.rs
|
| 9376830c9f4f9b5b7c541fc1ca3c1beb20936df8 |
12-Nov-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'master' into honeycomb-release
|
| 8fd40311898a9ec759a76f021642f43e617e38c4 |
11-Nov-2010 |
Jim Shuma <jshuma@google.com> |
Allow carousel apps to receive taps on detail textures
Change-Id: I909edf4f05e268a00a3727fa684f3d83360e2225
arousel/java/com/android/ex/carousel/CarouselRS.java
arousel/java/com/android/ex/carousel/CarouselViewHelper.java
arousel/java/com/android/ex/carousel/carousel.rs
arousel/test/src/com/android/carouseltest/CarouselTestActivity.java
|
| cb97ddb8f456aabec8cbc11216d0cfad456b1037 |
11-Nov-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'master' into honeycomb-release
|
| 8e08abc64fa1f4fa08f5407c040819f14f626dfd |
11-Nov-2010 |
Doug Zongker <dougz@android.com> |
am 046a9e08: add "transaction_event" eventlog tag
* commit '046a9e0835f0922e9388001b157daa504356a4cf':
add "transaction_event" eventlog tag
|
| 046a9e0835f0922e9388001b157daa504356a4cf |
06-Nov-2010 |
Doug Zongker <dougz@android.com> |
add "transaction_event" eventlog tag
Bug: 3171309
Change-Id: I55a3cc5c35281796352379ab548249b19f4156ea
ommon/java/com/android/common/GoogleLogTags.logtags
|
| 719502bd8812e11b4dd95d62b00145383a4223c0 |
04-Nov-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'master' into honeycomb-release
|
| 1882cebdc1b7b0551189ca33fb7cb77ef10c988b |
03-Nov-2010 |
Jim Miller <jaggies@google.com> |
Add better event handling to Carousel.
This changes Carousel to rely on historical event times instead
of the wallclock. This has the effect of improving Carousel's
velocity estimate, which provides much smoother tracking of
the user's intended motion.
Change-Id: I987294386212b88fdfbf847a12735e4badf6045c
arousel/java/com/android/ex/carousel/CarouselController.java
arousel/java/com/android/ex/carousel/CarouselRS.java
arousel/java/com/android/ex/carousel/CarouselView.java
arousel/java/com/android/ex/carousel/carousel.rs
|
| 3c13d5d8403d7eaead0ebd358ce04844edef106b |
03-Nov-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'master' into honeycomb-release
|
| 1eccd028e704c15e842c1f23254d77a1a0a4cae0 |
02-Nov-2010 |
Jim Miller <jaggies@google.com> |
Several improvements to Carousel:
- Use pool of allocations to reduce GCs in Carousel.
- Hold of selection scale animation for 100ms
- Fixed bug with detail ruler not being drawn at pixel coordinates.
- Fixed bug where adding cards caused all cards to be refreshed.
Change-Id: I0ca254b6b3c3e4d9b2ce6575d25c8ede59b0a075
arousel/java/com/android/ex/carousel/CarouselRS.java
arousel/java/com/android/ex/carousel/carousel.rs
arousel/test/src/com/android/carouseltest/CarouselTestActivity.java
|
| ba02d0c6d2c0cc3e550e5bf4c5d3c5914727442c |
02-Nov-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'master' into honeycomb-release
|
| 6f2cc8cf611860467315ecc542f71a225625eb1c |
02-Nov-2010 |
Jason Sams <rjsams@android.com> |
User RS resize instead of manually implementing a copy routine.
Change-Id: I201cafd9683752252e6e484e5fb6d370a4ec6cce
arousel/java/com/android/ex/carousel/CarouselRS.java
arousel/java/com/android/ex/carousel/carousel.rs
|
| d8e3f4656171ef6b0b28b12d7f1df29bbc95767d |
01-Nov-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'master' into honeycomb-release
|
| dcfb45adbcf37de68920c181322aaa9e4e4b58d8 |
27-Oct-2010 |
Stephen Hines <srhines@google.com> |
Fix local variable usage.
Change-Id: Id475a5bee0ba7b25ef3fbab863969a82e144a7c6
arousel/java/com/android/ex/carousel/carousel.rs
|
| ce50a94bc347e335aafc4124d4de1c78d7e8cb40 |
29-Oct-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'master' into honeycomb-release
|
| be5482f170e191aa98a3c2ecefdeaf936b7df412 |
29-Oct-2010 |
Jim Miller <jaggies@google.com> |
Major improvement to Carousel dragging.
This change adds new drag choices to Carousel:
DRAG_MODEL_PLANE, DRAG_MODEL_CYLINDER_INSIDE and DRAG_MODEL_CYLINDER_OUTSIDE.
The old drag model is still available as DRAG_MODEL_SCREEN_DELTA.
Change-Id: I339c21ceaa493fb302c6b57adebfa2063a68d69a
arousel/java/com/android/ex/carousel/CarouselController.java
arousel/java/com/android/ex/carousel/CarouselRS.java
arousel/java/com/android/ex/carousel/CarouselView.java
arousel/java/com/android/ex/carousel/carousel.rs
arousel/test/src/com/android/carouseltest/CarouselTestActivity.java
|
| fb179e7afd8f02be63061b478b0283e3085fc25f |
25-Oct-2010 |
Jim Miller <jaggies@google.com> |
Carousel performance improvements.
This change disables depth and changes the background bitmap
for the test case to 256x256 instead of 512x512. With these
two changes, Carousel consistently achieves 87fps with no
background and 78fps with. Both tests were with sync-to-vblank
disabled.
It also cleans up the program store names to have more
meaningful names as we add new states.
Upload after rebase.
Change-Id: I6008fbd89fbe924dbea10792b3f787fe69586fa0
arousel/java/com/android/ex/carousel/CarouselController.java
arousel/java/com/android/ex/carousel/CarouselRS.java
arousel/java/com/android/ex/carousel/CarouselView.java
arousel/java/com/android/ex/carousel/carousel.rs
arousel/test/res/drawable/border.png
arousel/test/res/layout/carousel_test.xml
arousel/test/src/com/android/carouseltest/CarouselTestActivity.java
arousel/test/src/com/android/carouseltest/MusicDemoActivity.java
|
| 4306f4b8cddee50b72c0cea23d65ff9c47c0d460 |
27-Oct-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'master' into honeycomb-release
|
| fe38385c1e5ce443adb962c066adeea185ad3d74 |
26-Oct-2010 |
Bryan Mawhinney <bryanmawhinney@google.com> |
Ensure detail textures are positioned at integer pixel coords
Change-Id: I4ffe64e009e465d310eea875f835522a40ffc825
arousel/java/com/android/ex/carousel/carousel.rs
|
| 28082f2e6709c78a60d1dab5948a7ebfcbb4f8bb |
25-Oct-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'master' into honeycomb-release
|
| 7cc5787b49708f63aeb818bdd06efed3d4229925 |
21-Oct-2010 |
Jim Shuma <jshuma@google.com> |
Switch to using ModelViewController-based CarouselView
Change-Id: I5cd2ff8ce9b2102ab6b10f6d6a41f87e0f3a06f3
arousel/java/com/android/ex/carousel/CarouselController.java
arousel/java/com/android/ex/carousel/CarouselView.java
arousel/java/com/android/ex/carousel/CarouselViewHelper.java
arousel/java/com/android/ex/carousel/MVCCarouselView.java
arousel/java/com/android/ex/carousel/MVCCarouselViewHelper.java
arousel/test/src/com/android/carouseltest/CarouselTestActivity.java
arousel/test/src/com/android/carouseltest/MyCarouselView.java
arousel/test/src/com/android/carouseltest/TaskSwitcherActivity.java
|
| 4fc8177b31677a88623173d540089b78ee7e7b21 |
20-Oct-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'master' into honeycomb-release
|
| 4a8736e22d7b40ab9dfa3fbd8a10de92144912b3 |
14-Oct-2010 |
Bryan Mawhinney <bryanmawhinney@google.com> |
Provides more control over detail alignment.
Replaces setDrawDetailsBelowCard and setDetailTexturesCentered
with setDetailTextureAlignment, and implements support for
vertical centering.
Change-Id: Idee5f28235e269667132920421cfe32f91456285
arousel/java/com/android/ex/carousel/CarouselController.java
arousel/java/com/android/ex/carousel/CarouselRS.java
arousel/java/com/android/ex/carousel/CarouselView.java
arousel/java/com/android/ex/carousel/MVCCarouselView.java
arousel/java/com/android/ex/carousel/carousel.rs
|
| 41bce3a2c56e2e55c3a791c64552321d1a3bc411 |
19-Oct-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'master' into honeycomb-release
|
| cfe41767a3596a65eef91b6f68286fd0f916a4c7 |
19-Oct-2010 |
Jim Miller <jaggies@google.com> |
Fix 3099806: Prevent glitch when scrolling to end of Carousel.
This fixes a bug where some activities were seeing a
"bounce" at the end of the Carousel list. The issue would
happen because the velocity wasn't reset before the
overscroll animation completed, which meant any call causing
the screen to refresh would run doPhysics() which would cause
the overscroll animation to run.
Change-Id: I2e19603cca3e0ca3374010a762429b8d79804b9e
arousel/java/com/android/ex/carousel/carousel.rs
|
| 9897c2dc30f29f68145aa631a0769411ff645f10 |
15-Oct-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'master' into honeycomb-release
|
| 43471a7e84593d0dd855ec5c66d70891a6fd4c81 |
14-Oct-2010 |
Jim Miller <jaggies@google.com> |
Several major improvements to Carousel:
Improved selection criteria. It now looks for the finger to move less
than a minimum distance (currently 50 pixels) before allowing that
card to be selected or the carousel to move.
Greatly simplified animation detection logic.
Started adding new motion model methods.
Change-Id: I8a7dc85dcfe547ff7bc024ba8be941bb787075ec
arousel/java/com/android/ex/carousel/CarouselViewHelper.java
arousel/java/com/android/ex/carousel/carousel.rs
arousel/test/src/com/android/carouseltest/CarouselTestActivity.java
|
| a84feeb7e4dc1a75ec6d0b1f2494893987fc3ca3 |
15-Oct-2010 |
Jack Palevich <jackpal@google.com> |
Add API to get/set carousel rotation angle.
+ Add setCarouselRotationAngle
+ onAnimationFinished now returns the current carouselRotationAngle
+ remove Request/ReportFirstCardPositon, not required.
Note that the carouselRotationAngle is specified in floating point
slot positions, not radians or degrees.
Change-Id: I4f70c2aff07e9ab15a9bf6ac834ac5a61830a28b
arousel/java/com/android/ex/carousel/CarouselController.java
arousel/java/com/android/ex/carousel/CarouselRS.java
arousel/java/com/android/ex/carousel/CarouselView.java
arousel/java/com/android/ex/carousel/CarouselViewHelper.java
arousel/java/com/android/ex/carousel/MVCCarouselView.java
arousel/java/com/android/ex/carousel/MVCCarouselViewHelper.java
arousel/java/com/android/ex/carousel/carousel.rs
|
| 34dc150029b6a558b02f2f845fdbddd7504e0c62 |
14-Oct-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'master' into honeycomb-release
|
| 7fde14c2691d21378787831c45e305aec04cc5f7 |
14-Oct-2010 |
Bryan Mawhinney <bryanmawhinney@google.com> |
Merge "Guard against setting detail textures after destroy."
|
| 6d39f882df7f280e1aab0ccffad80181fd242247 |
14-Oct-2010 |
Maryam Garrett <mkamvar@google.com> |
am 66189d61: Only call VoiceSearch if there are IME logging actions
Merge commit '66189d6156b4aa76f25bb1465d9e0e6f39668b9e'
* commit '66189d6156b4aa76f25bb1465d9e0e6f39668b9e':
Only call VoiceSearch if there are IME logging actions
|
| 7ec486bf1373232a35efa96622f31ac1aff5456b |
14-Oct-2010 |
Bryan Mawhinney <bryanmawhinney@google.com> |
Guard against setting detail textures after destroy.
Change-Id: I0c375a05cbd44d354ea0439b5aecee59a1306ce3
arousel/java/com/android/ex/carousel/CarouselController.java
arousel/java/com/android/ex/carousel/CarouselView.java
arousel/java/com/android/ex/carousel/MVCCarouselView.java
|
| bf39450b962d91ec78af53db39826d55ddb39902 |
14-Oct-2010 |
Jim Shuma <jshuma@google.com> |
Disable the depth test when drawing detail textures
Add programStoreDetail for drawing detail textures. It
does blending (with non-premultiplied alpha) but not depth
testing, and does not write to the depth buffer.
Change-Id: I5c31f9fcf551320288dc6b047e54e6988591154c
arousel/java/com/android/ex/carousel/CarouselRS.java
arousel/java/com/android/ex/carousel/carousel.rs
|
| a98a3f4e0e22566454c1d23153bd72982871c7f0 |
13-Oct-2010 |
android-build SharedAccount <android-build@sekiwake.mtv.corp.google.com> |
Merge commit 'goog/gingerbread' into honeycomb-release
|
| 50c5e37bb3a952d1da78582d00922a28c55c0239 |
13-Oct-2010 |
Jack Palevich <jackpal@google.com> |
Set DrawCardsWithBlending state when starting up carousel.
Change-Id: I1c5371d65797fbbfcf5507fb82caea2666fad885
arousel/java/com/android/ex/carousel/CarouselView.java
|
| 229384cbd400a6c2eebef61654ed274a9759e233 |
13-Oct-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'master' into honeycomb-release
|
| 1ceb73ce68ea2db1c97994deb9e372d0abcddfd5 |
12-Oct-2010 |
Jim Shuma <jshuma@google.com> |
Don't clear the background
Since we always assume background textures are opaque,
do not clear the screen.
Change-Id: I30a11024f5e13d05dd2da04b44b131b3265a5d9c
arousel/java/com/android/ex/carousel/carousel.rs
|
| bfc5ce2da9e0d8d0ec2535c465624574d98418d7 |
12-Oct-2010 |
Jim Shuma <jshuma@google.com> |
Performance improvements: Enable blending only when needed
Never draw the background image with blending.
Draw card images with blending only when requested. By
default, blending is enabled, but [MVC]CarouselView
subclasses can disable it.
Change-Id: Ia66f0fb7df45881481f0b782983402fcecb4a29a
arousel/java/com/android/ex/carousel/CarouselController.java
arousel/java/com/android/ex/carousel/CarouselRS.java
arousel/java/com/android/ex/carousel/CarouselView.java
arousel/java/com/android/ex/carousel/MVCCarouselView.java
arousel/java/com/android/ex/carousel/carousel.rs
|
| 4fe6ea729d1fc44c8126de7a92a710c3885fb2ec |
11-Oct-2010 |
Jim Shuma <jshuma@google.com> |
Detail texture geometry fixes, and offscreen loading tweak
Changes in support of Simon Wilson's work on improving the
Books carousel appearance. Provide an option to center the
detail texture with respect to the card, as opposed to the
default left-alignment. Draw the detail texture based on the
bounding box of the card, not just on the left coordinate.
Add an option to specify how many offscreen cards are
maintained in memory (as opposed to just one on each side).
Change-Id: I696f7315423440a9cecb503f07be96ffee96424f
arousel/java/com/android/ex/carousel/CarouselController.java
arousel/java/com/android/ex/carousel/CarouselRS.java
arousel/java/com/android/ex/carousel/CarouselView.java
arousel/java/com/android/ex/carousel/MVCCarouselView.java
arousel/java/com/android/ex/carousel/carousel.rs
|
| f7c25f5cded67d7a4dc350247a340b20c19527c9 |
12-Oct-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'master' into honeycomb-release
|
| 8f914693fdfe7844532767cc86a01d57126f9f2b |
12-Oct-2010 |
Bjorn Bringert <bringert@android.com> |
Merge "ex: Move SyncStateContentProviderHelper to frameworks/ex"
|
| 6878dbe55ece9866c979054d34a04e59ae56dee0 |
11-Oct-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'master' into honeycomb-release
|
| d07d6655feb45ea4b4463a11ee9cc31886141b0a |
11-Oct-2010 |
Jason Sams <rjsams@android.com> |
Update to use SurfaceConfig.
Change-Id: I52378a935339f0c9878597995f1b0de9ca388414
arousel/java/com/android/ex/carousel/MVCCarouselView.java
|
| e38053da575e53eea84ebaf9b0ddc7f0d73364f0 |
11-Oct-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'master' into honeycomb-release
|
| a6e619351f9fc23f0e6ec486b8de6138e4a08f4c |
08-Oct-2010 |
Bjorn Bringert <bringert@android.com> |
ex: Move SyncStateContentProviderHelper to frameworks/ex
Change-Id: I9584926a41d002d4e4153fcf241e98cecd74278c
ommon/java/com/android/common/content/SyncStateContentProviderHelper.java
|
| fc1960b04f7746f8bdb13cc5bf3297fe0928c851 |
10-Oct-2010 |
Jason Sams <rjsams@android.com> |
Update to use SurfaceConfig.
Change-Id: I3e04225c9241d96fa6be390eb32fe06fee994e1d
arousel/java/com/android/ex/carousel/CarouselView.java
|
| b06b5d3798e2668b8b5660da625c13c743daf469 |
09-Oct-2010 |
Stephen Hines <srhines@google.com> |
Remove now unnecessary pragma rs export_var().
Change-Id: I8b5ecb9959d1ca506621e9f7228f3b9cd8698278
arousel/java/com/android/ex/carousel/carousel.rs
|
| d7fa647e6fa4e832381be5bdd03065f9ea35c3f1 |
08-Oct-2010 |
Jim Shuma <jshuma@google.com> |
Adjust the bounds for how far books can sway
Change-Id: I1e4a56cf8df900d7cfeccc9ab323e9af2c71a73b
arousel/java/com/android/ex/carousel/carousel.rs
|
| 594ff62c170509c0d69b30f4c2a5e71d4799a9c8 |
08-Oct-2010 |
Jim Shuma <jshuma@google.com> |
Add long-press support to carousel
Change-Id: I65f468d4d0104bac2e98a8e97ec3ba49db42c7d5
arousel/java/com/android/ex/carousel/CarouselController.java
arousel/java/com/android/ex/carousel/CarouselRS.java
arousel/java/com/android/ex/carousel/CarouselView.java
arousel/java/com/android/ex/carousel/CarouselViewHelper.java
arousel/java/com/android/ex/carousel/MVCCarouselView.java
arousel/java/com/android/ex/carousel/MVCCarouselViewHelper.java
arousel/java/com/android/ex/carousel/carousel.rs
|
| 7af0f2e36e5e3f069198bddf3fc8709f5679d07a |
08-Oct-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'master' into honeycomb-release
|
| 83d7a5f03e6511372f73e3e4e03a6d403b20125d |
07-Oct-2010 |
Bryan Mawhinney <bryanmawhinney@google.com> |
Provide option to allow cards to face the center of the carousel circle.
Change-Id: I74ea4308316735ef5ec28318e4dc9374410894fa
arousel/java/com/android/ex/carousel/CarouselController.java
arousel/java/com/android/ex/carousel/CarouselRS.java
arousel/java/com/android/ex/carousel/CarouselView.java
arousel/java/com/android/ex/carousel/MVCCarouselView.java
arousel/java/com/android/ex/carousel/carousel.rs
|
| ff8ee273c386a343dbb1b709ef1cb76ba85226e3 |
07-Oct-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'master' into honeycomb-release
|
| a044fbbb1e5498a0112f20a1b0de11a4089ef612 |
07-Oct-2010 |
Jim Miller <jaggies@google.com> |
Substantial improvement to Carousel launch time.
This fixes a bug where compiling the renderscript was done
multiple times. The operation is fairly expensive and was
taking about 800ms per call, repeated over several calls.
The new code compiles it just once in the CarouselRS
constructor and keeps a reference to it.
Change-Id: I6cbf92062a995e2d847f40e737448e0bc6684d76
arousel/java/com/android/ex/carousel/CarouselRS.java
arousel/java/com/android/ex/carousel/CarouselView.java
arousel/java/com/android/ex/carousel/MVCCarouselView.java
|
| 5621100edc38c6e7f7fd7ef54945ba035204fe49 |
07-Oct-2010 |
Jim Shuma <jshuma@google.com> |
Fix typo
Change-Id: I59664c495dc5106846829eee3449231fb72062f7
arousel/java/com/android/ex/carousel/CarouselController.java
|
| 64005a896385cd651f7c25a05a6e59cdd0b2f7b0 |
07-Oct-2010 |
Jim Shuma <jshuma@google.com> |
Merge "Refactoring Carousel into MVC: Phase 1"
|
| 7b8b23f9c04fa33b79a8949752a90a134a11df8a |
07-Oct-2010 |
Dmitri Plotnikov <dplotnikov@google.com> |
Moving GroupingListAdapter to frameworks/ex
Moving from packages/apps/Contacts
adb shell am instrument -e class com.android.common.widget.GroupingListAdapterTests -w com.android.common.tests/android.test.InstrumentationTestRunner
com.android.common.widget.GroupingListAdapterTests:.............
Test results for InstrumentationTestRunner=.............
Time: 0.03
OK (13 tests)
Change-Id: Ia58fe362afdc5c64e3740c89049be29f5b329a5b
ommon/java/com/android/common/widget/GroupingListAdapter.java
ommon/tests/src/com/android/common/widget/GroupingListAdapterTests.java
|
| 9f0c6badc3e8f928c6f2658a3c85ea50319424d4 |
06-Oct-2010 |
Alex Sakhartchouk <alexst@google.com> |
changing texcoord from vec4 to vec2 for perf reasons.
Change-Id: I18a9f94694f8977db79d9cb42d0a7d88c41c9c24
arousel/java/com/android/ex/carousel/CarouselRS.java
|
| b8c3aee40f704e71fd9a8af41f060ebae2ea445f |
06-Oct-2010 |
Bryan Mawhinney <bryanmawhinney@google.com> |
Don't create any cards by default.
Otherwise there's a small chance we may request textures before a
listener is attached.
Change-Id: I95fe4c16ec6aedb81dc3e5e7b8c65b28d9f83131
arousel/java/com/android/ex/carousel/CarouselRS.java
|
| 2df1c446691dc67c47a4424e9e6adeeb094c0dac |
06-Oct-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'master' into honeycomb-release
|
| c7f405d16c2c7143de7fcda9c4f77f9758b5342a |
05-Oct-2010 |
Jim Shuma <jshuma@google.com> |
Refactoring Carousel into MVC: Phase 1
Split CarouselView into MVCCarouselView and CarouselController.
For now, CarouselView lives on for the benefit of other apps.
Books will be switching over to MVCCarouselView shortly.
Eventually the plan will be to have all carousel users switch
to MVCCarouselView (which will later be renamed CarouselView).
Change-Id: I56c7aa3269c3d3303c67c3698960be3495d8ce83
arousel/java/com/android/ex/carousel/CarouselController.java
arousel/java/com/android/ex/carousel/MVCCarouselView.java
arousel/java/com/android/ex/carousel/MVCCarouselViewHelper.java
|
| 2ba04e061b52c488a154739379501dc833e39f79 |
06-Oct-2010 |
Jim Miller <jaggies@google.com> |
Fix bug where resizing cards array caused cards to get reloaded.
Change-Id: I090dd17a01dada63461708760454f073b4b7cb13
arousel/java/com/android/ex/carousel/CarouselRS.java
arousel/java/com/android/ex/carousel/CarouselView.java
arousel/java/com/android/ex/carousel/CarouselViewHelper.java
arousel/java/com/android/ex/carousel/carousel.rs
arousel/test/src/com/android/carouseltest/CarouselTestActivity.java
|
| 84ccb69494d53118809ee011db0a22493c35080a |
05-Oct-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'master' into honeycomb-release
|
| f7c724da4bb4fcd3cd02add04a7bb8052e07e4c3 |
05-Oct-2010 |
Jim Miller <jaggies@google.com> |
Fix 3061600: Allow scrolling to last few items in CarouselView.
This fixes a bug where the last few items cannot be scrolled to.
The code now follows visibleDetailCount to allow scrolling all
cards into the "visible area" for inspection and selection.
Change-Id: I0fded18f0f7ac2828385164b287fec2f522dc3a0
Fixes: Music2, Books, Recents.
arousel/java/com/android/ex/carousel/carousel.rs
arousel/test/src/com/android/carouseltest/CarouselTestActivity.java
|
| b378af500b36226635b6343b1d5009ee9af44fc1 |
02-Oct-2010 |
Jim Miller <jaggies@google.com> |
Major performance improvements to Carousel:
Use single-texture shader when we don't need to blend. Gets
us to solid 55 fps in steady-state.
Add lineOffset parameter to DetailTextureParameters to allow
apps to set an offset from the top of screen.
Minor refactoring of picking rays in prep for oblique frustum
support.
Added 'debugRendering' flag to carousel.rs.
Updated CarouselTestActivity to demonstrate use of new properties.
Change-Id: I472e442a092ef83445ac30eb64265d49af022261
arousel/java/com/android/ex/carousel/CarouselRS.java
arousel/java/com/android/ex/carousel/CarouselView.java
arousel/java/com/android/ex/carousel/CarouselViewHelper.java
arousel/java/com/android/ex/carousel/carousel.rs
arousel/test/src/com/android/carouseltest/CarouselTestActivity.java
|
| eb61520daeb7157448cd4ed1004a9fa5a8b2b48f |
01-Oct-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'master' into honeycomb-release
|
| 66189d6156b4aa76f25bb1465d9e0e6f39668b9e |
01-Oct-2010 |
Maryam Garrett <mkamvar@google.com> |
Only call VoiceSearch if there are IME logging actions
LatinIME/VoiceInput will set a boolean value if there
are actions which need to be logged. This value will
be checked before sending the intent to VS. This way applications
which use IME can call this function without worrying about
sending "empty" logging intents.
Change-Id: If02971c1cada70aaac954a8a4dcf94794677fab9
ommon/java/com/android/common/userhappiness/UserHappinessSignals.java
|
| a9e9c4bef076e718094786edfe0290f798e1db4b |
01-Oct-2010 |
Jim Miller <jaggies@google.com> |
A few more Carousel improvements:
Add feature to fade detail texture out as it goes into the distance.
Fix background texture drawing performance by using single texture
shader instead of multi.
Fix minor bug with background texture after review, as agreed.
Change-Id: Ibd80f83058f78cf40cae902626fdfba2a4792ee9
arousel/java/com/android/ex/carousel/CarouselRS.java
arousel/java/com/android/ex/carousel/carousel.rs
|
| 8b55d7500c1e5a88c415dae8dcead16b152d7929 |
01-Oct-2010 |
Jack Palevich <jackpal@google.com> |
Preserve existing cards when resizing the card array.
Change-Id: I0f5a4e11585d289aaed9c3553b82a9df80f8acd0
arousel/java/com/android/ex/carousel/CarouselRS.java
arousel/java/com/android/ex/carousel/carousel.rs
|
| d281f19b40cbe5226c57650746e70cbe0e419577 |
30-Sep-2010 |
Jack Palevich <jackpal@google.com> |
Avoid calling RenderScript after view is detached from window.
Change-Id: I793663ee882ed6f2e933b93ebf1eb173a8ea2724
arousel/java/com/android/ex/carousel/CarouselView.java
|
| a8c3c446ef995680a8c98936cd286846fa1efc64 |
30-Sep-2010 |
Paul Westbrook <pwestbro@google.com> |
am b4f5e0e5: Fixed the Rfc822Validator
Merge commit 'b4f5e0e5755938f2be9a2f1a1a6609b018c530ad'
* commit 'b4f5e0e5755938f2be9a2f1a1a6609b018c530ad':
Fixed the Rfc822Validator
|
| 420b44b8b11ec1c309ea130e69a6876325dbfef9 |
29-Sep-2010 |
Jim Miller <jaggies@google.com> |
More improvements to Carousel.
Added new blending mode and render back-to-front for default view.
Added new "rez-in" effect for last few cards (selectable).
Added time-lapse fade-in as new textures become available.
Change-Id: Ic5e662bcd59fee127227a00529dd868342957a9f
arousel/java/com/android/ex/carousel/CarouselRS.java
arousel/java/com/android/ex/carousel/CarouselView.java
arousel/java/com/android/ex/carousel/carousel.rs
arousel/test/res/values/strings.xml
arousel/test/src/com/android/carouseltest/CarouselTestActivity.java
arousel/test/src/com/android/carouseltest/MusicDemoActivity.java
|
| b4f5e0e5755938f2be9a2f1a1a6609b018c530ad |
30-Sep-2010 |
Paul Westbrook <pwestbro@google.com> |
Fixed the Rfc822Validator
Make sure that the validator doesn't consider an email address
that has a domain that has more than one adjacent '.' characters valid
Bug: 3048703
Change-Id: I1c227f393738850d89b6da52693d806c231f3136
ommon/java/com/android/common/Rfc822Validator.java
ommon/tests/src/com/android/common/Rfc822ValidatorTest.java
|
| fbb2880545634a127633d1faf9ab91fed9d91fb5 |
30-Sep-2010 |
Jack Palevich <jackpal@google.com> |
Merge "Avoid calling RenderScript after view is detached from window."
|
| c3e94dc22d3c03b514bf3aff41082bfab7aca845 |
30-Sep-2010 |
Jack Palevich <jackpal@google.com> |
Avoid calling RenderScript after view is detached from window.
Change-Id: I793663ee882ed6f2e933b93ebf1eb173a8ea2724
arousel/java/com/android/ex/carousel/CarouselView.java
|
| f0690b242e9cfd6f153da45f80cdf1d4f1267236 |
30-Sep-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'master' into honeycomb-release
|
| 08bd50b6d1bf39f512225f8509d4121bacb39fba |
30-Sep-2010 |
Jack Palevich <jackpal@google.com> |
Merge "Add an onDestroy method"
|
| 2b7b815d64a667552eedc9c5bd992572ee4c73d4 |
30-Sep-2010 |
Jack Palevich <jackpal@google.com> |
Merge "Make Parameters objects static."
|
| 17d4817661d16464ffa0fd02cb6d1b362e96b8a1 |
30-Sep-2010 |
Dmitri Plotnikov <dplotnikov@google.com> |
De-duping autocomplete email addresses
Change-Id: I5029a9fb49862d87a32dcf87772a4e746887d0fa
ommon/java/com/android/common/contacts/BaseEmailAddressAdapter.java
|
| 9fa7a1887bd54f8833a772f8418b8f94c811ccf6 |
30-Sep-2010 |
Jack Palevich <jackpal@google.com> |
Add an onDestroy method
This method should be called when tearing down the view. By default it
quits the handler thread.
Change-Id: Iece07bf0fa9fa9ee454e83ed6a26381aa22c63ba
arousel/java/com/android/ex/carousel/CarouselViewHelper.java
|
| 0eb8cac611ca6d82dced0995d2ead3886c647170 |
30-Sep-2010 |
Jack Palevich <jackpal@google.com> |
Make Parameters objects static.
Change-Id: I763803595dc344eb50eb257b51bcacffebb94df1
arousel/java/com/android/ex/carousel/CarouselViewHelper.java
|
| 370b0cbd9a54809db2eaf55af3e0f533d0fe1b23 |
29-Sep-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'master' into honeycomb-release
|
| eb71cf6812bdb53bda75ac37a185f78f43ddfcef |
29-Sep-2010 |
Jim Shuma <jshuma@google.com> |
Expose getGeometry() like the other getters
Change-Id: I8d9abb4c75e7cb2afa70cef8c0d2baed0442b659
arousel/java/com/android/ex/carousel/CarouselViewHelper.java
|
| baa6653bc1165a787c44ed8781c8d258a8e4e798 |
29-Sep-2010 |
Jack Palevich <jackpal@google.com> |
Make CarouselViewHelper more reusable.
Allow subclasses to get at the async handler and view members.
Change-Id: I2696246de6a27ecf0a74ac7a45b36e1789eca1f7
arousel/java/com/android/ex/carousel/CarouselViewHelper.java
|
| 7de756e32d37389e1695e5595424f0e7314360d4 |
27-Sep-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'master' into honeycomb-release
|
| a3cb716626b477c98ba912698c765eab20f27286 |
27-Sep-2010 |
Jim Miller <jaggies@google.com> |
Major improvements to Carousel.
Added CarouselViewHelper class to simplify writing applications
that use the widged.
Updated examples to use new CarouselViewHelper class.
Added sample "lighting" to CarouselTestActivity.
Change-Id: I1b4a7e0d79f94781add16e1d2e7ec8b4657744d8
arousel/java/com/android/ex/carousel/CarouselRS.java
arousel/java/com/android/ex/carousel/CarouselView.java
arousel/java/com/android/ex/carousel/CarouselViewHelper.java
arousel/java/com/android/ex/carousel/CarouselViewUtilities.java
arousel/test/res/drawable/border.png
arousel/test/res/drawable/glossy_overlay.png
arousel/test/src/com/android/carouseltest/CarouselTestActivity.java
arousel/test/src/com/android/carouseltest/MusicDemoActivity.java
arousel/test/src/com/android/carouseltest/TaskSwitcherActivity.java
|
| 63d56fd1c9834aea31af45ed06a7f892bec01ea4 |
26-Sep-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'master' into honeycomb-release
|
| 7867abe6e7af226fc29285890d6decb0ce3daa0f |
24-Sep-2010 |
Jim Shuma <jshuma@google.com> |
Don't consider tap-to-stop as a selection
When the user taps while the carousel is rotating,
the user intent is to stop the carousel, not to make
a selection. Therefore, don't consider a tap to be
the beginning of a selection if it comes while
the carousel is animating.
Change-Id: I2e86e97926c368fbc40f0f123df1f251b98d4327
arousel/java/com/android/ex/carousel/carousel.rs
|
| d443c88da4c7cf1947c12b26f111cb899cc8afe4 |
24-Sep-2010 |
Jim Miller <jaggies@google.com> |
Temporary workaround for llvm crash.
Discovered this workaround while looking for the cause.
Checking in to unblock developers.
Change-Id: I1f861d20452589bad794e42f1b91a3b2c04d04bd
arousel/java/com/android/ex/carousel/carousel.rs
|
| af8cf9a3bbe517b604b48e217b00085351ab2496 |
24-Sep-2010 |
Shih-wei Liao <sliao@google.com> |
Change 1. to 1.f and use rsMatrixLoad. Carousel tests work for me.
Change-Id: I27aadc1adedc15136a95cd1a1546a3d51ca098f6
arousel/java/com/android/ex/carousel/carousel.rs
|
| bab0bb89ef656affd0610290f7197fdb156c6417 |
23-Sep-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'master' into honeycomb-release
|
| e0103cfd1a72197454e522834d2e8f600f798073 |
22-Sep-2010 |
Jack Palevich <jackpal@google.com> |
Bitmap's config now controls RenderScript texture format.
Allows clients to control when 16 bit vs 32 bit textures are used.
Change-Id: Icd9e144b64ef06ccdcfb687a5e191b7ba5079798
arousel/java/com/android/ex/carousel/CarouselRS.java
|
| b32cad07b612954d076840380d74bf23ffe809cb |
22-Sep-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'master' into honeycomb-release
|
| 7c09ccce478100d75e4427d87866ff19d758ae7a |
22-Sep-2010 |
Jim Shuma <jshuma@google.com> |
Support for Books carousel
Fixes a bug causing detail text to sway with the cover.
Allows specifying the number of detail textures to show.
Draw detail texture either above or below the card.
Makes optional the ruler from card to detail texture.
Change-Id: I41e45058eff1fdd4a3fea587ad4dd7f3bc75482a
arousel/java/com/android/ex/carousel/CarouselRS.java
arousel/java/com/android/ex/carousel/CarouselView.java
arousel/java/com/android/ex/carousel/carousel.rs
|
| 996aeedc6a31c7447bed9483365de1f172c59f11 |
20-Sep-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'master' into honeycomb-release
|
| 82f14986d3995d1a5357eb698f43e4a161725260 |
18-Sep-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'master' into honeycomb-release
|
| c4c6f38bf410af40e10c63b152befd5a39df87c8 |
17-Sep-2010 |
Jim Miller <jaggies@google.com> |
Use proper rsObject methods when switching texture and geometry.
Fix race condition in set methods when invoked from RS thread.
Change-Id: I0734e287727f3ce77ac388512c49028b2428b614
arousel/java/com/android/ex/carousel/CarouselRS.java
arousel/java/com/android/ex/carousel/carousel.rs
|
| a9e1c1ddb6284fbcdc18aca659b207827d5f6851 |
17-Sep-2010 |
Jim Shuma <jshuma@google.com> |
Merge "Ensure renderscript is available to load geometry."
|
| 1126aa8ba186b42baf5b14c66d44b59f43888b70 |
17-Sep-2010 |
Stephen Hines <srhines@google.com> |
Handle RS reflection name changes.
Change-Id: I0b16fbbfe26e45d7f221c4420c4fb05b906bd6f7
arousel/java/com/android/ex/carousel/CarouselRS.java
|
| e386bbba584685f6261e6dc846c9d05c79b53535 |
17-Sep-2010 |
Bryan Mawhinney <bryanmawhinney@google.com> |
Ensure renderscript is available to load geometry.
This fixes a bug I introduced in the previous CL.
Change-Id: I9c3160623fe827a854fe8adb47a578faff2a4bca
arousel/java/com/android/ex/carousel/CarouselView.java
|
| ffd2d025459cfd383fff8889c6293b951f864ac1 |
16-Sep-2010 |
Bryan Mawhinney <bryanmawhinney@google.com> |
Fix RenderScriptGL leak in CarouselView.
Previously we called ensureRenderScript both when creating the view
and when attaching it to a window. This caused us to overwrite
the RenderScriptGL instance without shutting it down first.
Change-Id: Ie448f1135121111bd379b1a7e827acd7e3834bcf
arousel/java/com/android/ex/carousel/CarouselView.java
|
| 7ef93418d9eb6204644ddb832b75c3c83707ce5d |
16-Sep-2010 |
Jim Miller <jaggies@google.com> |
Fix for 3007426: Fix crash in CarouselView
Change-Id: I66fd91376b579d08dd776565153b212ee4f136fa
arousel/java/com/android/ex/carousel/CarouselView.java
|
| 1e9a4915f33f3ccdd6253201e7aec1901c780234 |
16-Sep-2010 |
repo sync <mxw@google.com> |
Merge "Revert "ExpandoLayout""
|
| 3e919976d4eb87384c1be0ab82caf985f786aa47 |
16-Sep-2010 |
Jim Miller <jaggies@google.com> |
Fix bug where power-of-two textures were showing up black in Carousel.
Change-Id: Id1a578f63e137eadca4bb1419863fcd2db154dcb
arousel/java/com/android/ex/carousel/CarouselRS.java
arousel/test/src/com/android/carouseltest/CarouselTestActivity.java
|
| d2d12062e69e235113ff52e1bd059b6730b986e4 |
16-Sep-2010 |
repo sync <mxw@google.com> |
Revert "ExpandoLayout"
This reverts commit 112087b9bd4a239df4359c144b11512c56be896d.
ommon/Android.mk
ommon/java/com/android/common/widget/ExpandoLayout.java
|
| 3172fb522983b4a2b2f7e5e5b6ea6771be65dd46 |
16-Sep-2010 |
Jim Miller <jaggies@google.com> |
Merge "Fix for 3007426: Fix crash in CarouselView"
|
| 6b1fa13e79a6ae467d16da223fd36db53fa5a5cb |
16-Sep-2010 |
Jim Miller <jaggies@google.com> |
Fix for 3007426: Fix crash in CarouselView
Change-Id: I66fd91376b579d08dd776565153b212ee4f136fa
arousel/java/com/android/ex/carousel/CarouselView.java
|
| 3b3b29152f5d7ae21e74b73f7e09375ff431092c |
16-Sep-2010 |
repo sync <mxw@google.com> |
Merge "ExpandoLayout"
|
| 3df59346f395434454d310b070fff195089fbaf1 |
16-Sep-2010 |
Jim Miller <jaggies@google.com> |
Fix for potential memory corruption in RS when cardcount = 0
This bug is related to a previous workaround for a limitation in RS where
an allocation cannot have a size of 0. Instead of creating the allocation,
it would set the allocation to null.
This workaround always allocates at least one card and adds a
shadow variable to indicate when the array is valid.
Also added checks for negative numbers.
Change-Id: Icc37f5da048b8177b93b05472a093f695e6ecc86
arousel/java/com/android/ex/carousel/CarouselRS.java
arousel/java/com/android/ex/carousel/carousel.rs
arousel/test/src/com/android/carouseltest/CarouselTestActivity.java
|
| b0f070636c29ad178f4e21306f301fe3d20c183b |
16-Sep-2010 |
Jim Miller <jaggies@google.com> |
Expose setting the background color of the Carousel.
Switch setBackgroundColor() api from Float4 to float to avoid
forcing apps to explicitly import RenderScript Float4 data type.
Change-Id: I650ac0a74cd2abce489a9526652e1c31a93ea9be
arousel/java/com/android/ex/carousel/CarouselRS.java
arousel/java/com/android/ex/carousel/CarouselView.java
arousel/java/com/android/ex/carousel/carousel.rs
arousel/test/src/com/android/carouseltest/CarouselTestActivity.java
|
| 7cb0068e59dde61ef0e649735199e5ba31c9c6af |
14-Sep-2010 |
Jim Miller <jaggies@google.com> |
Add detail text to Carousel and CarouselTestActivity.
Add better documentation to CarouselView.
Remove unnecessary log spew.
Updated documentation after review.
Change-Id: I13df9f9bcac8898b198e3dbf06b11ae7522dc8f1
arousel/java/com/android/ex/carousel/CarouselRS.java
arousel/java/com/android/ex/carousel/CarouselView.java
arousel/java/com/android/ex/carousel/carousel.rs
arousel/test/src/com/android/carouseltest/CarouselTestActivity.java
arousel/test/src/com/android/carouseltest/MusicDemoActivity.java
arousel/test/src/com/android/carouseltest/TaskSwitcherActivity.java
|
| 112087b9bd4a239df4359c144b11512c56be896d |
15-Sep-2010 |
repo sync <mxw@google.com> |
ExpandoLayout
Change-Id: I6e9bdcca682f11038332b6c0065af78a67cc5d42
ommon/Android.mk
ommon/java/com/android/common/widget/ExpandoLayout.java
|
| 198a060d650bc849ef0f25b597888fac9546803b |
15-Sep-2010 |
Jack Palevich <jackpal@google.com> |
Add an API to report the first card position.
Change-Id: I07072569f9e02a327aed4a2b13b3748899687b33
arousel/java/com/android/ex/carousel/CarouselRS.java
arousel/java/com/android/ex/carousel/CarouselView.java
arousel/java/com/android/ex/carousel/carousel.rs
arousel/test/src/com/android/carouseltest/CarouselTestActivity.java
arousel/test/src/com/android/carouseltest/MusicDemoActivity.java
arousel/test/src/com/android/carouseltest/TaskSwitcherActivity.java
|
| c0bb8af58ae15674178f2db240283719918c6f28 |
15-Sep-2010 |
Jim Shuma <jshuma@google.com> |
Integrate functionality from the Books carousel
This change is getting ready for the Books app to
use the system carousel. It integrates functionality
that previously only existed Books:
- Swaying based on the velocity of the user drag
- Disabling overscroll
- Disabling jumping into position
- Some stability improvements
To do this, it exposes the following functionality
publicly from CarouselView:
- radius
- sway sensitivity
- friction coefficient
- drag factor
- point to lookAt
The changes to Books to use this are at change #68137
Change-Id: Ie81c3b328716d7edb1652e9a8b6ecfd161c7fabc
arousel/java/com/android/ex/carousel/CarouselRS.java
arousel/java/com/android/ex/carousel/CarouselView.java
arousel/java/com/android/ex/carousel/carousel.rs
|
| d380848706642b7d3bf9b33f012f5e6035645a59 |
11-Sep-2010 |
Jim Shuma <jshuma@google.com> |
Merge "Update book model for Renderscript changes"
|
| f8a1b84de4a7a7fad5aa11d4a004a722ec8f4971 |
11-Sep-2010 |
Jim Miller <jaggies@google.com> |
Replace outdated book model in Carousel tests.
Change-Id: Icf0f7bfc818b25ed5423fc255984fddfe85b8d3a
arousel/test/res/raw/book.a3d
|
| a8d94efec0fd7a574b63984696f8f711021029f6 |
10-Sep-2010 |
Jim Miller <jaggies@google.com> |
Merge "Add background texture support to Carousel widget."
|
| f6d25a8946bbc079550749786b2801df4af3d582 |
10-Sep-2010 |
Brad Fitzpatrick <bradfitz@android.com> |
am 575e1982: Use SharedPreferences.apply() when possible, else use commit()
Merge commit '575e19825099eb83d1d452ffce93314aa66432ed'
* commit '575e19825099eb83d1d452ffce93314aa66432ed':
Use SharedPreferences$Editor.apply() when possible, else use commit()
|
| 575e19825099eb83d1d452ffce93314aa66432ed |
09-Sep-2010 |
Brad Fitzpatrick <bradfitz@android.com> |
Use SharedPreferences$Editor.apply() when possible, else use commit()
Change-Id: I48b18015214c90dd071b74bd807eb4346c0179c2
ommon/java/com/android/common/OperationScheduler.java
ommon/java/com/android/common/SharedPreferencesCompat.java
|
| bfbb01fec1146021277230da65c8bd607a41aec5 |
08-Sep-2010 |
Jim Shuma <jshuma@google.com> |
Update book model for Renderscript changes
This change syncs up the carousel with Renderscript
CL 64390 (70d4e5024298f71edb3b04867e05568f5495b4ce),
and BREAKS COMPATIBILITY WITH older versions.
Change-Id: Ife19b83509f058a9df8b55af102e4a27ffc75ac3
arousel/test/res/raw/book.a3d
|
| 9afba8c61f6aff94c68acbfaae1cc58bd28c13ea |
04-Sep-2010 |
Jim Miller <jaggies@google.com> |
Add background texture support to Carousel widget.
This allows an application to specify a background texture to draw behind the carousel.
Change-Id: I2eefc3fe460acf704a46d80698c0aae493e9de58
arousel/java/com/android/ex/carousel/CarouselRS.java
arousel/java/com/android/ex/carousel/CarouselView.java
arousel/java/com/android/ex/carousel/carousel.rs
arousel/test/res/drawable/background.png
arousel/test/src/com/android/carouseltest/MusicDemoActivity.java
|
| dce9af330efceae2b8d1d7c25e7e236b4e21719b |
03-Sep-2010 |
Jack Palevich <jackpal@google.com> |
Send invalidation messages for loading textures and geometry.
Previously we only sent the invalidation messages for loaded textures and
geometry. Now we send invalidation messages for both loading and loaded
textures and geometry.
This allows clients that have asynchronous loaders to cancel loading of
queued textures and geometry.
Change-Id: I5b92b732e09076d48248a0ee3fdc02efc279d644
arousel/java/com/android/ex/carousel/carousel.rs
|
| 5ce730797a8a7278dfe19dac8a9460b25675fed0 |
02-Sep-2010 |
Jim Miller <jaggies@google.com> |
Add carousel as static library to build.
Change-Id: I5e3eb0a6c3ea6deeee3856c486bbb469c8d20360
arousel/Android.mk
arousel/java/com/android/ex/carousel/CarouselRS.java
arousel/java/com/android/ex/carousel/CarouselView.java
arousel/java/com/android/ex/carousel/carousel.rs
arousel/test/Android.mk
arousel/test/AndroidManifest.xml
arousel/test/res/anim/zoom_enter.xml
arousel/test/res/anim/zoom_exit.xml
arousel/test/res/drawable/blank_album.png
arousel/test/res/drawable/emo_im_angel.png
arousel/test/res/drawable/emo_im_cool.png
arousel/test/res/drawable/emo_im_crying.png
arousel/test/res/drawable/emo_im_foot_in_mouth.png
arousel/test/res/drawable/emo_im_happy.png
arousel/test/res/drawable/emo_im_kissing.png
arousel/test/res/drawable/emo_im_laughing.png
arousel/test/res/drawable/emo_im_lips_are_sealed.png
arousel/test/res/drawable/emo_im_money_mouth.png
arousel/test/res/drawable/emo_im_sad.png
arousel/test/res/drawable/emo_im_surprised.png
arousel/test/res/drawable/emo_im_tongue_sticking_out.png
arousel/test/res/drawable/emo_im_undecided.png
arousel/test/res/drawable/emo_im_winking.png
arousel/test/res/drawable/emo_im_wtf.png
arousel/test/res/drawable/emo_im_yelling.png
arousel/test/res/drawable/specularmap.png
arousel/test/res/drawable/unknown.png
arousel/test/res/drawable/wait.png
arousel/test/res/layout/music_demo.xml
arousel/test/res/layout/taskswitcher.xml
arousel/test/res/raw/book.a3d
arousel/test/res/values/strings.xml
arousel/test/src/com/android/carouseltest/CarouselTestActivity.java
arousel/test/src/com/android/carouseltest/MusicDemoActivity.java
arousel/test/src/com/android/carouseltest/MyCarouselView.java
arousel/test/src/com/android/carouseltest/TaskSwitcherActivity.java
|
| 1fa3a8f74d46a616e27c23ed1512f4b7de2ad66d |
01-Sep-2010 |
Dmitri Plotnikov <dplotnikov@google.com> |
More smooth UI for email autocomplete
The "Searching..." UI is only shown if the results
take longer than MESSAGE_SEARCH_PENDING_DELAY to
arrive.
Change-Id: I05a5cdd05c0a35ec728fe3e79e0032ac68371ebf
ommon/java/com/android/common/contacts/BaseEmailAddressAdapter.java
|
| 1e35ed124efed58b9ef6e70059865cbd145bbce8 |
01-Sep-2010 |
Dmitri Plotnikov <dplotnikov@google.com> |
Limiting the number of email suggestions for autocomplete
Directories will need handle the "limit=" query
parameter as well.
Change-Id: I71486b187aa05cabc3194bd5a50fcbdd13e9284b
ommon/java/com/android/common/contacts/BaseEmailAddressAdapter.java
|
| 55f04311fb40ccadb224f1a4dc1b8ff473dfdf03 |
01-Sep-2010 |
Dmitri Plotnikov <dplotnikov@google.com> |
Correct formating of an email when name is unknown
Also, reducing the number of change notifications
Change-Id: If075fee9a96dc8191c264fc34162969afe4027b6
ommon/java/com/android/common/contacts/BaseEmailAddressAdapter.java
ommon/java/com/android/common/widget/CompositeCursorAdapter.java
|
| 950b496faf3cbae2a4d08b957cbf6708d2dee8bd |
30-Aug-2010 |
Maryam Garrett <mkamvar@google.com> |
Merge changes I78f3d743,I5fc85898
* changes:
New LoggingEvent Extra for NBEST selections in Voice IME
New LoggingEvent Extra for NBEST selections in Voice IME
|
| d86a1caf8f291e6d77f29aa837c43b57db646dfc |
30-Aug-2010 |
Maryam Garrett <mkamvar@google.com> |
New LoggingEvent Extra for NBEST selections in Voice IME
Change-Id: I78f3d743d417a688342feb167e50a4e5114bc0b0
ommon/java/com/android/common/speech/LoggingEvents.java
|
| d67de73dd8dadd3c59b91b4b50316ac3ae8bca25 |
30-Jul-2010 |
Maryam Garrett <mkamvar@google.com> |
New LoggingEvent Extra for NBEST selections in Voice IME
Change-Id: I5fc858986c90b1153218bf6c6e187e5324e92a36
ommon/java/com/android/common/speech/LoggingEvents.java
|
| 22cb78016de447ec1a1b270a6fc22352c3186929 |
28-Aug-2010 |
Dmitri Plotnikov <dplotnikov@google.com> |
Temporary fix for the user and userdebug builds
Change-Id: I4c7c55e6a362d4ae0d4896dfc5a5820f7c6a36ce
ommon/Android.mk
ommon/java/com/android/common/contacts/BaseEmailAddressAdapter.java
|
| 5cc774535d73c09b6788b63ecc728e60da09cfa9 |
27-Aug-2010 |
Dmitri Plotnikov <dplotnikov@google.com> |
General purpose email address autocomplete
Change-Id: I3545805e2e31eb645c54394545f625b35a6e366f
ommon/Android.mk
ommon/java/com/android/common/contacts/BaseEmailAddressAdapter.java
ommon/java/com/android/common/widget/CompositeCursorAdapter.java
|
| 60ae52719e0567fa5b1860df19807716951eca50 |
20-Aug-2010 |
Dmitri Plotnikov <dplotnikov@google.com> |
Moving CompositeCursorAdapter from contacts/widget to common/widget
The class has been used in contacts for a while,
now it will be shared with Gmail, Email and Calendar
for the purposes of integration with Directory API.
Change-Id: I86258dfff426e246d7791b737af574c47b935c7f
ommon/java/com/android/common/widget/CompositeCursorAdapter.java
ommon/tests/src/com/android/common/widget/CompositeCursorAdapterTest.java
|
| 633762157e4143063c1d0436c7dab7d42e61ddb9 |
17-Aug-2010 |
Jean-Baptiste Queru <jbq@google.com> |
am 9bf11ac4: Add CleanSpec.mk
Merge commit '9bf11ac4ed548faaa101b6766a4d4d52d4915daa'
* commit '9bf11ac4ed548faaa101b6766a4d4d52d4915daa':
Add CleanSpec.mk
|
| 9bf11ac4ed548faaa101b6766a4d4d52d4915daa |
14-Aug-2010 |
Jean-Baptiste Queru <jbq@google.com> |
Add CleanSpec.mk
Change-Id: Id4873dce0cc03283b0cbdbd80f3057ee63c639b2
leanSpec.mk
|
| d8e057e067696d5e75999fcec1736b8963f3bf92 |
01-Jul-2010 |
satok <satok@google.com> |
Move EditStyledText from framework to the static library.
- Move from core/java/com/android/internal/widget/EditStyledText.java
- Package name was changed to com.android.ex.editstyledtext
-- New naming rule com.android.ex.<package>.<class>
- Deleted all internal APIs
- COnfirmend that the framework was built completely
Change-Id: I371dd034356cde5a7502fbf5cfed090acb0978c4
ommon/java/com/android/ex/editstyledtext/EditStyledText.java
|
| 8320c15293c46f9f1de9137dd1ce9465a0c66e9c |
30-Jun-2010 |
Mike LeBeau <mlebeau@android.com> |
am 42680cd9: Backport https://android-git.corp.google.com/g/50799 from master into gingerbread. The gingerbread branch didn\'t exist when davidi made that change, but it was intended for anything after Froyo. Without this, the android-common.jar in the gingerbread bran
Merge commit '42680cd95b187a634de129c501aea4758072ad55'
* commit '42680cd95b187a634de129c501aea4758072ad55':
Backport https://android-git.corp.google.com/g/50799 from master into
|
| 42680cd95b187a634de129c501aea4758072ad55 |
30-Jun-2010 |
Mike LeBeau <mlebeau@android.com> |
Backport https://android-git.corp.google.com/g/50799 from master into
gingerbread. The gingerbread branch didn't exist when davidi made that
change, but it was intended for anything after Froyo. Without this,
the android-common.jar in the gingerbread branch was incompatible with
the new voice search.
Change-Id: Ia1d2221cf63d506ccb739da6c811bc8790225949
ommon/java/com/android/common/speech/LoggingEvents.java
|
| f8ea315012986b35c247da1d7660f0845e1d50bf |
30-Jun-2010 |
Mike LeBeau <mlebeau@android.com> |
am 915260ea: Add RESULT_CLICKED logging event to LoggingEvents.
Merge commit '915260ea53a7363038cf65d851e2e2d616429868'
* commit '915260ea53a7363038cf65d851e2e2d616429868':
Add RESULT_CLICKED logging event to LoggingEvents.
|
| 915260ea53a7363038cf65d851e2e2d616429868 |
30-Jun-2010 |
Mike LeBeau <mlebeau@android.com> |
Add RESULT_CLICKED logging event to LoggingEvents.
Bug 2702825
Change-Id: Iaa187a26e933e6fa9a65fac0f74ddef78c5050c3
ommon/java/com/android/common/speech/LoggingEvents.java
|
| cbb960ca7ccf450a743a315068cf60ccd95fecca |
16-Jun-2010 |
Ying Wang <wangying@google.com> |
Merge 2 changes from master.
Change-Id: I20384bb557ec24bf55cdad0e633f4a814791e5e7
ommon/Android.mk
ommon/java/com/android/common/speech/LoggingEvents.java
|
| 823b6f3516076b92f78c3fc27037d24bb514e653 |
15-Jun-2010 |
Ying Wang <wangying@google.com> |
move android-common from framework/base to framework/ex
Also change the LOCAL_SDK_VERSION from current to 8.
Change-Id: I68943b8b41622dab88c7b13d8c067b39205f028e
ommon/Android.mk
ommon/java/com/android/common/ArrayListCursor.java
ommon/java/com/android/common/GoogleLogTags.logtags
ommon/java/com/android/common/NetworkConnectivityListener.java
ommon/java/com/android/common/OperationScheduler.java
ommon/java/com/android/common/Rfc822InputFilter.java
ommon/java/com/android/common/Rfc822Validator.java
ommon/java/com/android/common/Search.java
ommon/java/com/android/common/speech/LoggingEvents.java
ommon/java/com/android/common/speech/Recognition.java
ommon/java/com/android/common/userhappiness/UserHappinessSignals.java
ommon/tests/Android.mk
ommon/tests/AndroidManifest.xml
ommon/tests/src/com/android/common/OperationSchedulerTest.java
ommon/tools/make-iana-tld-pattern.py
|
| b87362e0a6de2bf398fd4b135c66adcfbb42d8e7 |
09-Jun-2010 |
Ed Heyl <edheyl@google.com> |
new project, first commit
|